diff options
| author | John Stebbins <jstebbins@jetheaddev.com> | 2018-08-27 12:57:07 -0700 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-09-08 19:08:34 -0300 |
| commit | c9a992d931440f87882771532b7178477c5b0ebe (patch) | |
| tree | 283c4453ebb3c37031f07443a6f2b1e843b8af82 | |
| parent | 6e15495bcb2004e4e648160b22383ef72cc0e14c (diff) | |
| download | ffmpeg-c9a992d931440f87882771532b7178477c5b0ebe.tar.gz | |
lavf/mov: add AVCodecTag entry for GoPro metadata
This allows for validation of the track type
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/isom.c | 5 | ||||
| -rw-r--r-- | libavformat/isom.h | 1 | ||||
| -rw-r--r-- | libavformat/mov.c | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index ce66d1bcd4..ca9d22e4f7 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -374,6 +374,11 @@ const AVCodecTag ff_codec_movsubtitle_tags[] = { { AV_CODEC_ID_NONE, 0 }, }; +const AVCodecTag ff_codec_movdata_tags[] = { + { AV_CODEC_ID_BIN_DATA, MKTAG('g', 'p', 'm', 'd') }, + { AV_CODEC_ID_NONE, 0 }, +}; + /* map numeric codes from mdhd atom to ISO 639 */ /* cf. QTFileFormat.pdf p253, qtff.pdf p205 */ /* http://developer.apple.com/documentation/mac/Text/Text-368.html */ diff --git a/libavformat/isom.h b/libavformat/isom.h index 51abea52de..f3a7a8633d 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -41,6 +41,7 @@ extern const AVCodecTag ff_mp4_obj_type[]; extern const AVCodecTag ff_codec_movvideo_tags[]; extern const AVCodecTag ff_codec_movaudio_tags[]; extern const AVCodecTag ff_codec_movsubtitle_tags[]; +extern const AVCodecTag ff_codec_movdata_tags[]; int ff_mov_iso639_to_lang(const char lang[4], int mp4); int ff_mov_lang_to_iso639(unsigned code, char to[4]); diff --git a/libavformat/mov.c b/libavformat/mov.c index d922e0f173..aa8022ae52 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2034,6 +2034,8 @@ static int mov_codec_id(AVStream *st, uint32_t format) id = ff_codec_get_id(ff_codec_movsubtitle_tags, format); if (id > 0) st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; + else + id = ff_codec_get_id(ff_codec_movdata_tags, format); } } @@ -2507,6 +2509,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) mov_parse_stsd_subtitle(c, pb, st, sc, size - (avio_tell(pb) - start_pos)); } else { + st->codecpar->codec_id = id; ret = mov_parse_stsd_data(c, pb, st, sc, size - (avio_tell(pb) - start_pos)); if (ret < 0) |