diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 13:31:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 14:32:19 +0100 |
| commit | cefabaad3e882004ca7a54ea39500ee8e1c6ea93 (patch) | |
| tree | 30ad9cb33ff0a749d06bedab8894aedf3f9f9a38 /libavcodec/error_resilience.c | |
| parent | 45fd4ec9ef2b3a7074c49cdddac6e7dcc127a874 (diff) | |
| parent | e5419709f50593769037ab77d7102f82d9260784 (diff) | |
| download | ffmpeg-cefabaad3e882004ca7a54ea39500ee8e1c6ea93.tar.gz | |
Merge commit 'e5419709f50593769037ab77d7102f82d9260784'
* commit 'e5419709f50593769037ab77d7102f82d9260784':
lavc: remove the extended_data workarounds.
Conflicts:
libavcodec/utils.c
One hunk is not merged as not all codecs are updated yet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/error_resilience.c')
0 files changed, 0 insertions, 0 deletions