diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 12:33:46 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 12:33:46 +0400 |
| commit | 4427fe7e4bf652856e4ee4101fae3c361fc8637f (patch) | |
| tree | 2ff6e849a30c27483a8b62cdce7055a8374de8ce /libavformat/oggparsetheora.c | |
| parent | e1848aa469b7fc7f65df7656593ce382923e7371 (diff) | |
| parent | 5c0a09839c707f10e5dba59460e219e989c1da93 (diff) | |
Merge commit '5c0a09839c707f10e5dba59460e219e989c1da93'
* commit '5c0a09839c707f10e5dba59460e219e989c1da93':
libopenjpegdec: return meaningful error codes
Conflicts:
libavcodec/libopenjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggparsetheora.c')
0 files changed, 0 insertions, 0 deletions