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
2013-02-17Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: error_resilience: add required headers. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-17error_resilience: add required headers.Anton Khirnov
2013-02-16Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'Michael Niedermayer
* commit '54974c62982ae827becdbdb9b620b7ba75d079a0': error_resilience: decouple ER from MpegEncContext Conflicts: libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-15error_resilience: decouple ER from MpegEncContextAnton Khirnov