[FFmpeg-cvslog] avformat/mov: Enable parser for mp3s by old HandBrake
Michael Niedermayer
git at videolan.org
Sun Dec 13 02:15:05 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Dec 9 21:45:07 2015 +0100| [861f47ddf463926da2cba9e12665e7f004419f4b] | committer: Michael Niedermayer
avformat/mov: Enable parser for mp3s by old HandBrake
Fixes Ticket5047
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=861f47ddf463926da2cba9e12665e7f004419f4b
---
libavformat/isom.h | 1 +
libavformat/mov.c | 13 +++++++++++++
2 files changed, 14 insertions(+)
diff --git a/libavformat/isom.h b/libavformat/isom.h
index 65a64d4..255efd1 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -188,6 +188,7 @@ typedef struct MOVContext {
MOVTrackExt *trex_data;
unsigned trex_count;
int itunes_metadata; ///< metadata are itunes style
+ int handbrake_version;
int chapter_track;
int use_absolute_path;
int ignore_editlist;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 03aca0f..06e80c8 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -447,6 +447,12 @@ retry:
snprintf(key2, sizeof(key2), "%s-%s", key, language);
av_dict_set(&c->fc->metadata, key2, str, 0);
}
+ if (!strcmp(key, "encoder")) {
+ int major, minor, micro;
+ if (sscanf(str, "HandBrake %d.%d.%d", &major, &minor, µ) == 3) {
+ c->handbrake_version = 1000000*major + 1000*minor + micro;
+ }
+ }
}
av_log(c->fc, AV_LOG_TRACE, "lang \"%3s\" ", language);
av_log(c->fc, AV_LOG_TRACE, "tag \"%s\" value \"%s\" atom \"%.4s\" %d %"PRId64"\n",
@@ -4693,6 +4699,13 @@ static int mov_read_header(AVFormatContext *s)
return err;
}
}
+ if (mov->handbrake_version &&
+ mov->handbrake_version <= 1000000*0 + 1000*10 + 0 && // 0.10.0
+ st->codec->codec_id == AV_CODEC_ID_MP3
+ ) {
+ av_log(s, AV_LOG_VERBOSE, "Forcing full parsing for mp3 stream\n");
+ st->need_parsing = AVSTREAM_PARSE_FULL;
+ }
}
if (mov->trex_data) {
More information about the ffmpeg-cvslog
mailing list