diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-17 16:10:23 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-17 16:10:23 +0200 |
commit | 4916e220a60a08c8bf6c7da0786e4a29b14d93d6 (patch) | |
tree | 5bc63cd07fe9158ab6c6751d89851e2e46b1acf5 /libavcodec/qcelpdata.h | |
parent | 8cff853b23362b0cb88e6d424e3362a437c1a6b7 (diff) | |
parent | bac8d38c0a716c8bdfdecf0ae545015c68f5df36 (diff) | |
download | ffmpeg-4916e220a60a08c8bf6c7da0786e4a29b14d93d6.tar.gz |
Merge commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36'
* commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36':
rv10: return meaningful error codes.
Conflicts:
libavcodec/rv10.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qcelpdata.h')
0 files changed, 0 insertions, 0 deletions