c2ad22ff99
Merge commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4'
...
* commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4':
yuv4mpegdec: initialize field_order in yuv4_read_header()
Conflicts:
libavformat/yuv4mpegdec.c
See: 52a17972de
2015-01-29 21:55:02 +01:00
08fa34bf75
yuv4mpegdec: initialize field_order in yuv4_read_header()
...
CC: libav-stable@libav.org
Bug-Id: CID 1265721
2015-01-29 15:26:33 +00:00
52a17972de
avformat/yuv4mpegdec: fix "warning: field_order may be used uninitialized in this function"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-10 14:46:39 +01:00
213e82b55c
Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517'
...
* commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517':
yuv4mpegdec: do not set coded_frame properties
Conflicts:
libavformat/yuv4mpegdec.c
See: b45a3e167f
2014-05-18 14:02:31 +02:00
56d3cd1455
Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'
...
* commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37':
yuv4mpeg: split the demuxer and muxer into separate files
Conflicts:
libavformat/yuv4mpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18 13:37:25 +02:00
b513bf6f69
yuv4mpegdec: do not set coded_frame properties
...
coded_frame is not meant to be changed from outside of lavc, and is not
used for decoding.
Set AVCodecContext.field_order instead.
2014-05-18 10:22:08 +02:00
e4dc1000d7
yuv4mpeg: split the demuxer and muxer into separate files
2014-05-18 10:21:31 +02:00
Michael Niedermayer
Vittorio Giovara
Anton Khirnov