diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:09:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:10:10 +0100 |
| commit | 749fadaa651e21540f3c86561be9be9f098ddb44 (patch) | |
| tree | 97cd15b417f251e8ddada313bde68bdf68720c6c /README.md | |
| parent | 8120061be26980380c9e786c603ba6d3f4d1109f (diff) | |
| parent | 1551602b423755c4ed98c5b7b2c2d6504416726e (diff) | |
| download | ffmpeg-749fadaa651e21540f3c86561be9be9f098ddb44.tar.gz | |
Merge commit '1551602b423755c4ed98c5b7b2c2d6504416726e' into release/2.4
* commit '1551602b423755c4ed98c5b7b2c2d6504416726e':
nutdec: check av_new_packet return value
Conflicts:
libavformat/nutdec.c
See: bb502411ddb9fe1928d4a999693a3a49b83f8698
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions