diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:11:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:11:14 +0100 |
| commit | 4b20d307b32b3562b7cd595cd00dae30203a51fc (patch) | |
| tree | 17ee8efca7410f6f222b61f7b48799ddfaebd721 /ffmpeg.c | |
| parent | d30660306ceb070a3d74bca3b4a9f99a09b685dc (diff) | |
| parent | 7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8 (diff) | |
| download | ffmpeg-4b20d307b32b3562b7cd595cd00dae30203a51fc.tar.gz | |
Merge commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8'
* commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8':
indeo2: check decoding errors.
indeo2: return meaningful error codes
rl2: cosmetics, reformat
Conflicts:
libavcodec/rl2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions