Merge commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136'

* commit '7b6aae23e12f41cdfac7f1069debfe44d9a3d136':
  electronicarts: read the framerate for MAD

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-22 19:52:49 +02:00
commit ce1059d5c9

View File

@ -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: