diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:24:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:24:32 +0100 |
| commit | 501db2f32babff8e2851ffd7aeb6bcb1ecb47d19 (patch) | |
| tree | a911a0ca4813975ecc9baae4182b3fea8ef45944 /libavfilter/af_join.c | |
| parent | 4b20d307b32b3562b7cd595cd00dae30203a51fc (diff) | |
| parent | 9dbbda235d93d628777b986e502213f1ed390973 (diff) | |
| download | ffmpeg-501db2f32babff8e2851ffd7aeb6bcb1ecb47d19.tar.gz | |
Merge commit '9dbbda235d93d628777b986e502213f1ed390973'
* commit '9dbbda235d93d628777b986e502213f1ed390973':
vb: return meaningful error codes.
ptx: return meaningful error codes.
tiff: return meaningful error codes.
vqavideo: return meaningful error codes.
mss2: return meaningful error codes.
v210dec: return meaningful error codes
indeo2: cosmetics, reformat
Conflicts:
libavcodec/indeo2.c
libavcodec/tiff.c
libavcodec/v210dec.c
libavcodec/vb.c
libavcodec/vqavideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_join.c')
0 files changed, 0 insertions, 0 deletions