summaryrefslogtreecommitdiff
path: root/libavformat/yuv4mpegdec.c
Commit message (Collapse)AuthorAge
* Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517'Michael Niedermayer2014-05-18
|\ | | | | | | | | | | | | | | | | | | | | * commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517': yuv4mpegdec: do not set coded_frame properties Conflicts: libavformat/yuv4mpegdec.c See: b45a3e167f497d82effbf8ada453ea47b0ee21da Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * yuv4mpegdec: do not set coded_frame propertiesAnton Khirnov2014-05-18
| | | | | | | | | | | | coded_frame is not meant to be changed from outside of lavc, and is not used for decoding. Set AVCodecContext.field_order instead.
* | Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'Michael Niedermayer2014-05-18
|/ | | | | | | | | | * commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37': yuv4mpeg: split the demuxer and muxer into separate files Conflicts: libavformat/yuv4mpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* yuv4mpeg: split the demuxer and muxer into separate filesAnton Khirnov2014-05-18
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 09:45:45 +0000