diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:29:37 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:29:37 +0200 |
commit | 301522f521f05c998fb8dfba153d49e557604507 (patch) | |
tree | 89342e95cce1caf0f73de912a0529decd406e7da /libavformat/mxf.c | |
parent | 9265bae3567c85b55fc4cdfad141bb34a939d6fd (diff) | |
parent | f80b60ad59945dae32bb26a4e239ed94b0e92fa3 (diff) | |
download | ffmpeg-301522f521f05c998fb8dfba153d49e557604507.tar.gz |
Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'
* commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3':
bitstream: forward error values and drop few abort()
Conflicts:
libavcodec/bitstream.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxf.c')
0 files changed, 0 insertions, 0 deletions