diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:03:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:04:15 +0100 |
| commit | 8120061be26980380c9e786c603ba6d3f4d1109f (patch) | |
| tree | d0797f16954f46b276ef98c8ea6031344e069547 /tools/enum_options.c | |
| parent | 34b28d3823af91e0200cec859844a18684efe9c2 (diff) | |
| parent | 4cd0041d38664adcb6f4b3038e277631b85d5dc8 (diff) | |
| download | ffmpeg-8120061be26980380c9e786c603ba6d3f4d1109f.tar.gz | |
Merge commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8' into release/2.4
* commit '4cd0041d38664adcb6f4b3038e277631b85d5dc8':
rmdec: check av_new_packet return value
Conflicts:
libavformat/rmdec.c
See: c01a462cda8d7f298a3ac6d20752d23a11e43a8a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/enum_options.c')
0 files changed, 0 insertions, 0 deletions