diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 12:21:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 12:24:00 +0200 |
| commit | e5558391b5aee8e0a99ac10ba9ecd4727439b69a (patch) | |
| tree | 5f1bbc0d9e39a27ac569179bb021356fdef8c645 /libavcodec/targa_y216dec.c | |
| parent | 294af5140132521f11723467c7230e7285702545 (diff) | |
| parent | b8b809908ec547b2609dbac24194f4fd2df61aea (diff) | |
| download | ffmpeg-e5558391b5aee8e0a99ac10ba9ecd4727439b69a.tar.gz | |
Merge commit 'b8b809908ec547b2609dbac24194f4fd2df61aea'
* commit 'b8b809908ec547b2609dbac24194f4fd2df61aea':
4xm: forward errors from decode_p_block
Conflicts:
libavcodec/4xm.c
Impossible to be false check has been replaced by av_assert0()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/targa_y216dec.c')
0 files changed, 0 insertions, 0 deletions