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

Side by Side Diff: source/patched-ffmpeg-mt/libavformat/asfdec.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 * ASF compatible demuxer 2 * ASF compatible demuxer
3 * Copyright (c) 2000, 2001 Fabrice Bellard 3 * Copyright (c) 2000, 2001 Fabrice Bellard
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 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 if (rfc1766 && strlen(rfc1766) > 1) { 652 if (rfc1766 && strlen(rfc1766) > 1) {
653 const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' } ; // ignore country code if any 653 const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' } ; // ignore country code if any
654 const char *iso6392 = av_convert_lang_to(primary_tag, AV_LAN G_ISO639_2_BIBL); 654 const char *iso6392 = av_convert_lang_to(primary_tag, AV_LAN G_ISO639_2_BIBL);
655 if (iso6392) 655 if (iso6392)
656 av_metadata_set2(&st->metadata, "language", iso6392, 0); 656 av_metadata_set2(&st->metadata, "language", iso6392, 0);
657 } 657 }
658 } 658 }
659 } 659 }
660 } 660 }
661 661
662 ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv);
663
662 return 0; 664 return 0;
663 } 665 }
664 666
665 #define DO_2BITS(bits, var, defval) \ 667 #define DO_2BITS(bits, var, defval) \
666 switch (bits & 3) \ 668 switch (bits & 3) \
667 { \ 669 { \
668 case 3: var = get_le32(pb); rsize += 4; break; \ 670 case 3: var = get_le32(pb); rsize += 4; break; \
669 case 2: var = get_le16(pb); rsize += 2; break; \ 671 case 2: var = get_le16(pb); rsize += 2; break; \
670 case 1: var = get_byte(pb); rsize++; break; \ 672 case 1: var = get_byte(pb); rsize++; break; \
671 default: var = defval; break; \ 673 default: var = defval; break; \
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
1228 AVInputFormat asf_demuxer = { 1230 AVInputFormat asf_demuxer = {
1229 "asf", 1231 "asf",
1230 NULL_IF_CONFIG_SMALL("ASF format"), 1232 NULL_IF_CONFIG_SMALL("ASF format"),
1231 sizeof(ASFContext), 1233 sizeof(ASFContext),
1232 asf_probe, 1234 asf_probe,
1233 asf_read_header, 1235 asf_read_header,
1234 asf_read_packet, 1236 asf_read_packet,
1235 asf_read_close, 1237 asf_read_close,
1236 asf_read_seek, 1238 asf_read_seek,
1237 asf_read_pts, 1239 asf_read_pts,
1238 .metadata_conv = ff_asf_metadata_conv,
1239 }; 1240 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698