Michael Niedermayer
|
59e46ef63a
|
Merge remote-tracking branch 'qatar/master'
* qatar/master:
error_resilience: add required headers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-02-17 14:24:09 +01:00 |
|
Anton Khirnov
|
1f8f43a5b5
|
error_resilience: add required headers.
|
2013-02-17 06:46:43 +01:00 |
|
Michael Niedermayer
|
1fad547cef
|
Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'
* 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-16 18:54:56 +01:00 |
|
Anton Khirnov
|
54974c6298
|
error_resilience: decouple ER from MpegEncContext
|
2013-02-15 16:10:11 +01:00 |
|