diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 19:52:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 20:50:16 +0200 |
| commit | ce1059d5c9098d4c2f89288653198b2c03ea8f85 (patch) | |
| tree | 21828f4d4286d327a5ae24c69bf71c9f0614199d | |
| parent | 4adad5a19ac85de69ced6b1d154344609ff4e493 (diff) | |
| parent | 7b6aae23e12f41cdfac7f1069debfe44d9a3d136 (diff) | |
| download | ffmpeg-ce1059d5c9098d4c2f89288653198b2c03ea8f85.tar.gz | |
Merge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'
* commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136':
electronicarts: read the framerate for MAD
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/electronicarts.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 1314f6a144..0ae6512377 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -420,6 +420,8 @@ static int process_ea_header(AVFormatContext *s) case MADk_TAG: ea->video_codec = AV_CODEC_ID_MAD; + avio_skip(pb, 6); + ea->time_base = (AVRational) { avio_rl16(pb), 1000 }; break; case MVhd_TAG: |