diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 03:37:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 03:37:21 +0200 |
| commit | d6095662706d3f0b334645eb7f92ed24a4d9e4ed (patch) | |
| tree | f3938dfd8567ea1868ddc11ad9a5eec05925d71f /libavformat/ffm.h | |
| parent | 6d2a2bfb59f849fadc82374aa8463ac34444ba82 (diff) | |
| parent | f1ed83e23add1c26c50b146727e4c2399dfc0b3a (diff) | |
| download | ffmpeg-d6095662706d3f0b334645eb7f92ed24a4d9e4ed.tar.gz | |
Merge commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a'
* commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a':
img2dec: check av_new_packet return value
Conflicts:
libavformat/img2dec.c
See: 3f8148911c6e6e1f2a042bd4ca3ad8516a92130c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffm.h')
0 files changed, 0 insertions, 0 deletions