diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 21:30:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-19 21:36:23 +0200 |
| commit | 194d0399a29cedd9726e4a4b791ca959a7e71e45 (patch) | |
| tree | 20705788c66abf1af9bc3c9d9a641e0bd2921db1 /libavcodec/h264_ps.c | |
| parent | 833bc6678f7f300e4adc7182894ba3388bb2964c (diff) | |
| parent | 505642f18276aed03278ac91b1f334ea888eac6a (diff) | |
| download | ffmpeg-194d0399a29cedd9726e4a4b791ca959a7e71e45.tar.gz | |
Merge commit '505642f18276aed03278ac91b1f334ea888eac6a'
* commit '505642f18276aed03278ac91b1f334ea888eac6a':
mp3dec: fallback to generic seeking when a TOC is not present
Conflicts:
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_ps.c')
0 files changed, 0 insertions, 0 deletions