Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Side by Side Diff: source/patched-ffmpeg-mt/libavformat/matroskadec.c

Issue 4533003: patched ffmpeg nov 2 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Matroska file demuxer 2 * Matroska file demuxer
3 * Copyright (c) 2003-2008 The FFmpeg Project 3 * Copyright (c) 2003-2008 The FFmpeg Project
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 matroska_convert_tag(s, &tags[i].sub, metadata, key); 1052 matroska_convert_tag(s, &tags[i].sub, metadata, key);
1053 } 1053 }
1054 if (lang) { 1054 if (lang) {
1055 av_strlcat(key, "-", sizeof(key)); 1055 av_strlcat(key, "-", sizeof(key));
1056 av_strlcat(key, lang, sizeof(key)); 1056 av_strlcat(key, lang, sizeof(key));
1057 av_metadata_set2(metadata, key, tags[i].string, 0); 1057 av_metadata_set2(metadata, key, tags[i].string, 0);
1058 if (tags[i].sub.nb_elem) 1058 if (tags[i].sub.nb_elem)
1059 matroska_convert_tag(s, &tags[i].sub, metadata, key); 1059 matroska_convert_tag(s, &tags[i].sub, metadata, key);
1060 } 1060 }
1061 } 1061 }
1062 ff_metadata_conv(metadata, NULL, ff_mkv_metadata_conv);
1062 } 1063 }
1063 1064
1064 static void matroska_convert_tags(AVFormatContext *s) 1065 static void matroska_convert_tags(AVFormatContext *s)
1065 { 1066 {
1066 MatroskaDemuxContext *matroska = s->priv_data; 1067 MatroskaDemuxContext *matroska = s->priv_data;
1067 MatroskaTags *tags = matroska->tags.elem; 1068 MatroskaTags *tags = matroska->tags.elem;
1068 int i, j; 1069 int i, j;
1069 1070
1070 for (i=0; i < matroska->tags.nb_elem; i++) { 1071 for (i=0; i < matroska->tags.nb_elem; i++) {
1071 if (tags[i].target.attachuid) { 1072 if (tags[i].target.attachuid) {
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
1937 1938
1938 AVInputFormat matroska_demuxer = { 1939 AVInputFormat matroska_demuxer = {
1939 "matroska,webm", 1940 "matroska,webm",
1940 NULL_IF_CONFIG_SMALL("Matroska/WebM file format"), 1941 NULL_IF_CONFIG_SMALL("Matroska/WebM file format"),
1941 sizeof(MatroskaDemuxContext), 1942 sizeof(MatroskaDemuxContext),
1942 matroska_probe, 1943 matroska_probe,
1943 matroska_read_header, 1944 matroska_read_header,
1944 matroska_read_packet, 1945 matroska_read_packet,
1945 matroska_read_close, 1946 matroska_read_close,
1946 matroska_read_seek, 1947 matroska_read_seek,
1947 .metadata_conv = ff_mkv_metadata_conv,
1948 }; 1948 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698