[SCM] libav/experimental: Move CONIG_MUXERS below struct frame_attributes, it's not muxer-specific. patch by Colin Ward, hitman*at*codehq*dot*org

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:46:20 UTC 2013


The following commit has been merged in the experimental branch:
commit 72fbc5092a10e4139cbfddcdc4bc1b40e9326bde
Author: Colin Ward <hitman at codehq.org>
Date:   Wed Feb 8 15:39:12 2006 +0000

    Move CONIG_MUXERS below struct frame_attributes, it's not muxer-specific.
    patch by Colin Ward, hitman*at*codehq*dot*org
    
    Originally committed as revision 4962 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index 361ef8e..dd62320 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -22,13 +22,13 @@
 #define Y4M_FRAME_MAGIC "FRAME"
 #define Y4M_LINE_MAX 256
 
-#ifdef CONFIG_MUXERS
-
 struct frame_attributes {
     int interlaced_frame;
     int top_field_first;
 };
 
+#ifdef CONFIG_MUXERS
+
 static int yuv4_generate_header(AVFormatContext *s, char* buf)
 {
     AVStream *st;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list