diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:18:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:19:11 +0100 |
| commit | 298f7f1fac0bd3423188f113da875ebfb040bdc8 (patch) | |
| tree | b91362883f901478d3ded0d5b4226e9eea543140 /libavformat/nsvdec.c | |
| parent | fefb152cd94c1d52cc4bf6d42d194a1f4f3e316d (diff) | |
| parent | 7c710c38f6481b892e01d3c1e4781ad160b2935e (diff) | |
| download | ffmpeg-298f7f1fac0bd3423188f113da875ebfb040bdc8.tar.gz | |
Merge commit '7c710c38f6481b892e01d3c1e4781ad160b2935e' into release/2.4
* commit '7c710c38f6481b892e01d3c1e4781ad160b2935e':
audiointerleave: check av_new_packet return value
Conflicts:
libavformat/audiointerleave.c
See: 3ca8a2328878ebdb203e49d0a060df1b5337a370
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nsvdec.c')
0 files changed, 0 insertions, 0 deletions