diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 12:16:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 12:16:24 +0200 |
| commit | 26f6acc66b668aa9cb97d487aa980a361d4030a1 (patch) | |
| tree | 2a64ea7b14bf1d85948200fb02c03473d6726146 /libavformat/metadata.h | |
| parent | b0448e51235760b6ba8e9562c1233e43e818a1f7 (diff) | |
| parent | 5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4 (diff) | |
| download | ffmpeg-26f6acc66b668aa9cb97d487aa980a361d4030a1.tar.gz | |
Merge commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'
* commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4':
jpeg2000: Clean up return paths and error messages
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/metadata.h')
0 files changed, 0 insertions, 0 deletions