diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:19:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:19:51 +0100 |
| commit | 324797eb83dff7708a464e2ff61dd1551cc5c058 (patch) | |
| tree | c6e1614afe0a2301d5c1873a31c8ec220034a44f /libavformat/nsvdec.c | |
| parent | 298f7f1fac0bd3423188f113da875ebfb040bdc8 (diff) | |
| parent | b9b689550e7531b1a2cc893d2af623e37f266936 (diff) | |
| download | ffmpeg-324797eb83dff7708a464e2ff61dd1551cc5c058.tar.gz | |
Merge commit 'b9b689550e7531b1a2cc893d2af623e37f266936' into release/2.4
* commit 'b9b689550e7531b1a2cc893d2af623e37f266936':
img2dec: check av_new_packet return value
Conflicts:
libavformat/img2dec.c
See: 3f8148911c6e6e1f2a042bd4ca3ad8516a92130c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nsvdec.c')
0 files changed, 0 insertions, 0 deletions