diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 23:53:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 23:53:36 +0100 |
| commit | 39f5003a07db14c3a98617c052570383c6c0fd35 (patch) | |
| tree | 72ba9057a2d27d6bced3de1d0e5c8141c5399c3c /libavcodec/dxva2_mpeg2.c | |
| parent | 618d2262d71e3eca9e01b2d03d0a7d5946737cf0 (diff) | |
| parent | 5b977c1d4fd99f325049d48fb8f0a3240d50eef8 (diff) | |
| download | ffmpeg-39f5003a07db14c3a98617c052570383c6c0fd35.tar.gz | |
Merge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8'
* commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8':
mxf: Return meaningful errors
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxva2_mpeg2.c')
0 files changed, 0 insertions, 0 deletions