diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 03:27:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 03:27:13 +0200 |
| commit | 6d2a2bfb59f849fadc82374aa8463ac34444ba82 (patch) | |
| tree | b7c21542e191e02a78b19b1791a661211500aebb /libavformat/psxstr.c | |
| parent | 1945db1f13071aced7fcb25573980540c19156ea (diff) | |
| parent | 1967cd4e4c1cd96dfa195ce14e4b212ddb70586d (diff) | |
| download | ffmpeg-6d2a2bfb59f849fadc82374aa8463ac34444ba82.tar.gz | |
Merge commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d'
* commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d':
audiointerleave: check av_new_packet return value
Conflicts:
libavformat/audiointerleave.c
See: 3ca8a2328878ebdb203e49d0a060df1b5337a370
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/psxstr.c')
0 files changed, 0 insertions, 0 deletions