diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 18:46:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 18:54:56 +0100 |
| commit | 1fad547cefb4d2f3ed3d764b547ee16cf399e477 (patch) | |
| tree | e0c261a8eb1823e1ab9235d1ff7c66a8058a247c /libavformat/cache.c | |
| parent | 2bac1535db970e981e90306d64f2252be4c9fd63 (diff) | |
| parent | 54974c62982ae827becdbdb9b620b7ba75d079a0 (diff) | |
| download | ffmpeg-1fad547cefb4d2f3ed3d764b547ee16cf399e477.tar.gz | |
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>
Diffstat (limited to 'libavformat/cache.c')
0 files changed, 0 insertions, 0 deletions