diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 14:21:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 14:31:07 +0200 |
| commit | 83d2b7e9a25e719b22c6631c31c3fdcfc137fa75 (patch) | |
| tree | dd24ced7d983b9229450ab7fbc01e85894a92672 /libavformat/psxstr.c | |
| parent | ad9a877a6d77657e4aeab57eb2bddaa683a07fe5 (diff) | |
| parent | 17d57848fc14e82f76a65ffb25c90f2f011dc4a0 (diff) | |
| download | ffmpeg-83d2b7e9a25e719b22c6631c31c3fdcfc137fa75.tar.gz | |
Merge commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0'
* commit '17d57848fc14e82f76a65ffb25c90f2f011dc4a0':
mpc8: Make sure the first stream exists before parsing the seek table
Conflicts:
libavformat/mpc8.c
See: 69fb605ad5e0f1384ca4d06d38ce0f1b6c8c286d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/psxstr.c')
0 files changed, 0 insertions, 0 deletions