Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-07-10Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'Michael Niedermayer
* commit '650d384048ed42579cc6d67bf32a94b468c0b6cb': yuv4mpegenc: do not access AVCodecContext.coded_frame Conflicts: libavformat/yuv4mpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09yuv4mpegenc: do not access AVCodecContext.coded_frameAnton Khirnov
Its contents are meaningful only if the stream codec context is the one actually used for encoding, which is often not the case (and is discouraged). Use AVCodecContext.field_order instead.
2014-06-18Merge commit '194be1f43ea391eb986732707435176e579265aa'Michael Niedermayer
* commit '194be1f43ea391eb986732707435176e579265aa': lavf: switch to AVStream.time_base as the hint for the muxer timebase Conflicts: doc/APIchanges libavformat/filmstripenc.c libavformat/movenc.c libavformat/mxfenc.c libavformat/oggenc.c libavformat/swf.h libavformat/version.h tests/ref/lavf/mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18lavf: switch to AVStream.time_base as the hint for the muxer timebaseAnton Khirnov
Previously, AVStream.codec.time_base was used for that purpose, which was quite confusing for the callers. This change also opens the path for removing AVStream.codec. The change in the lavf-mkv test is due to the native timebase (1/1000) being used instead of the default one (1/90000), so the packets are now sent to the crc muxer in the same order in which they are demuxed (previously some of them got reordered because of inexact timestamp conversion).
2014-05-18Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'Michael Niedermayer
* commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37': yuv4mpeg: split the demuxer and muxer into separate files Conflicts: libavformat/yuv4mpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18yuv4mpeg: split the demuxer and muxer into separate filesAnton Khirnov