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

Side by Side Diff: source/patched-ffmpeg-mt/libavformat/movenc.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 * MOV, 3GP, MP4 muxer 2 * MOV, 3GP, MP4 muxer
3 * Copyright (c) 2003 Thomas Raivio 3 * Copyright (c) 2003 Thomas Raivio
4 * Copyright (c) 2004 Gildas Bazin <gbazin at videolan dot org> 4 * Copyright (c) 2004 Gildas Bazin <gbazin at videolan dot org>
5 * Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot co m> 5 * Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot co m>
6 * 6 *
7 * This file is part of FFmpeg. 7 * This file is part of FFmpeg.
8 * 8 *
9 * FFmpeg is free software; you can redistribute it and/or 9 * FFmpeg is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 1592 matching lines...) Expand 10 before | Expand all | Expand 10 after
1603 if (mov->mode & MODE_3GP) { 1603 if (mov->mode & MODE_3GP) {
1604 mov_write_3gp_udta_tag(pb_buf, s, "perf", "artist"); 1604 mov_write_3gp_udta_tag(pb_buf, s, "perf", "artist");
1605 mov_write_3gp_udta_tag(pb_buf, s, "titl", "title"); 1605 mov_write_3gp_udta_tag(pb_buf, s, "titl", "title");
1606 mov_write_3gp_udta_tag(pb_buf, s, "auth", "author"); 1606 mov_write_3gp_udta_tag(pb_buf, s, "auth", "author");
1607 mov_write_3gp_udta_tag(pb_buf, s, "gnre", "genre"); 1607 mov_write_3gp_udta_tag(pb_buf, s, "gnre", "genre");
1608 mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment"); 1608 mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment");
1609 mov_write_3gp_udta_tag(pb_buf, s, "albm", "album"); 1609 mov_write_3gp_udta_tag(pb_buf, s, "albm", "album");
1610 mov_write_3gp_udta_tag(pb_buf, s, "cprt", "copyright"); 1610 mov_write_3gp_udta_tag(pb_buf, s, "cprt", "copyright");
1611 mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date"); 1611 mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date");
1612 } else if (mov->mode == MODE_MOV) { // the title field breaks gtkpod wit h mp4 and my suspicion is that stuff is not valid in mp4 1612 } else if (mov->mode == MODE_MOV) { // the title field breaks gtkpod wit h mp4 and my suspicion is that stuff is not valid in mp4
1613 mov_write_string_metadata(s, pb_buf, "\251ART", "artist" , 0);
1613 mov_write_string_metadata(s, pb_buf, "\251nam", "title" , 0); 1614 mov_write_string_metadata(s, pb_buf, "\251nam", "title" , 0);
1614 mov_write_string_metadata(s, pb_buf, "\251aut", "author" , 0); 1615 mov_write_string_metadata(s, pb_buf, "\251aut", "author" , 0);
1615 mov_write_string_metadata(s, pb_buf, "\251alb", "album" , 0); 1616 mov_write_string_metadata(s, pb_buf, "\251alb", "album" , 0);
1616 mov_write_string_metadata(s, pb_buf, "\251day", "date" , 0); 1617 mov_write_string_metadata(s, pb_buf, "\251day", "date" , 0);
1617 mov_write_string_tag(pb_buf, "\251enc", LIBAVFORMAT_IDENT, 0, 0); 1618 mov_write_string_metadata(s, pb_buf, "\251swr", "encoder" , 0);
1618 mov_write_string_metadata(s, pb_buf, "\251des", "comment" , 0); 1619 mov_write_string_metadata(s, pb_buf, "\251des", "comment" , 0);
1619 mov_write_string_metadata(s, pb_buf, "\251gen", "genre" , 0); 1620 mov_write_string_metadata(s, pb_buf, "\251gen", "genre" , 0);
1620 mov_write_string_metadata(s, pb_buf, "\251cpy", "copyright" , 0); 1621 mov_write_string_metadata(s, pb_buf, "\251cpy", "copyright" , 0);
1621 } else { 1622 } else {
1622 /* iTunes meta data */ 1623 /* iTunes meta data */
1623 mov_write_meta_tag(pb_buf, mov, s); 1624 mov_write_meta_tag(pb_buf, mov, s);
1624 } 1625 }
1625 1626
1626 if (s->nb_chapters) 1627 if (s->nb_chapters)
1627 mov_write_chpl_tag(pb_buf, s); 1628 mov_write_chpl_tag(pb_buf, s);
(...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after
2291 sizeof(MOVMuxContext), 2292 sizeof(MOVMuxContext),
2292 CODEC_ID_AAC, 2293 CODEC_ID_AAC,
2293 CODEC_ID_H264, 2294 CODEC_ID_H264,
2294 mov_write_header, 2295 mov_write_header,
2295 ff_mov_write_packet, 2296 ff_mov_write_packet,
2296 mov_write_trailer, 2297 mov_write_trailer,
2297 .flags = AVFMT_GLOBALHEADER, 2298 .flags = AVFMT_GLOBALHEADER,
2298 .codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0}, 2299 .codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0},
2299 }; 2300 };
2300 #endif 2301 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698