diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 14:10:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 14:10:17 +0200 |
| commit | ad9a877a6d77657e4aeab57eb2bddaa683a07fe5 (patch) | |
| tree | 3e93c27ab5952b9190353348d0de34185d472125 /libswresample/swresample-test.c | |
| parent | d6e650d885941282955e4840d4bdd8aa6feb58fd (diff) | |
| parent | 459f2b393a3f89ed08d10fbceb4738d1429f268e (diff) | |
| download | ffmpeg-ad9a877a6d77657e4aeab57eb2bddaa683a07fe5.tar.gz | |
Merge commit '459f2b393a3f89ed08d10fbceb4738d1429f268e'
* commit '459f2b393a3f89ed08d10fbceb4738d1429f268e':
mpc8: Check the seek table size parsed from the bitstream
Conflicts:
libavformat/mpc8.c
See: b61ba262a1e275f8129b7383d70fe48051b47fcf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample-test.c')
0 files changed, 0 insertions, 0 deletions