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

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

Issue 2850032: ffmpeg update to june 23 version which fixes mp4 crash on still frames with 3... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 6 months 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
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/mmst.c ('k') | source/patched-ffmpeg-mt/libavformat/oma.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 enum PixelFormat pix_fmt; 619 enum PixelFormat pix_fmt;
620 uint32_t tag; 620 uint32_t tag;
621 unsigned bps; 621 unsigned bps;
622 } mov_pix_fmt_tags[] = { 622 } mov_pix_fmt_tags[] = {
623 { PIX_FMT_YUYV422, MKTAG('y','u','v','s'), 0 }, 623 { PIX_FMT_YUYV422, MKTAG('y','u','v','s'), 0 },
624 { PIX_FMT_UYVY422, MKTAG('2','v','u','y'), 0 }, 624 { PIX_FMT_UYVY422, MKTAG('2','v','u','y'), 0 },
625 { PIX_FMT_RGB555BE,MKTAG('r','a','w',' '), 16 }, 625 { PIX_FMT_RGB555BE,MKTAG('r','a','w',' '), 16 },
626 { PIX_FMT_RGB555LE,MKTAG('L','5','5','5'), 16 }, 626 { PIX_FMT_RGB555LE,MKTAG('L','5','5','5'), 16 },
627 { PIX_FMT_RGB565LE,MKTAG('L','5','6','5'), 16 }, 627 { PIX_FMT_RGB565LE,MKTAG('L','5','6','5'), 16 },
628 { PIX_FMT_RGB565BE,MKTAG('B','5','6','5'), 16 }, 628 { PIX_FMT_RGB565BE,MKTAG('B','5','6','5'), 16 },
629 { PIX_FMT_GRAY16BE,MKTAG('b','1','6','g'), 16 },
629 { PIX_FMT_RGB24, MKTAG('r','a','w',' '), 24 }, 630 { PIX_FMT_RGB24, MKTAG('r','a','w',' '), 24 },
630 { PIX_FMT_BGR24, MKTAG('2','4','B','G'), 24 }, 631 { PIX_FMT_BGR24, MKTAG('2','4','B','G'), 24 },
631 { PIX_FMT_ARGB, MKTAG('r','a','w',' '), 32 }, 632 { PIX_FMT_ARGB, MKTAG('r','a','w',' '), 32 },
632 { PIX_FMT_BGRA, MKTAG('B','G','R','A'), 32 }, 633 { PIX_FMT_BGRA, MKTAG('B','G','R','A'), 32 },
633 { PIX_FMT_RGBA, MKTAG('R','G','B','A'), 32 }, 634 { PIX_FMT_RGBA, MKTAG('R','G','B','A'), 32 },
634 { PIX_FMT_ABGR, MKTAG('A','B','G','R'), 32 }, 635 { PIX_FMT_ABGR, MKTAG('A','B','G','R'), 32 },
636 { PIX_FMT_RGB48BE, MKTAG('b','4','8','r'), 48 },
635 }; 637 };
636 638
637 static int mov_get_rawvideo_codec_tag(AVFormatContext *s, MOVTrack *track) 639 static int mov_get_rawvideo_codec_tag(AVFormatContext *s, MOVTrack *track)
638 { 640 {
639 int tag = track->enc->codec_tag; 641 int tag = track->enc->codec_tag;
640 int i; 642 int i;
641 643
642 for (i = 0; i < FF_ARRAY_ELEMS(mov_pix_fmt_tags); i++) { 644 for (i = 0; i < FF_ARRAY_ELEMS(mov_pix_fmt_tags); i++) {
643 if (track->enc->pix_fmt == mov_pix_fmt_tags[i].pix_fmt) { 645 if (track->enc->pix_fmt == mov_pix_fmt_tags[i].pix_fmt) {
644 tag = mov_pix_fmt_tags[i].tag; 646 tag = mov_pix_fmt_tags[i].tag;
(...skipping 1625 matching lines...) Expand 10 before | Expand all | Expand 10 after
2270 sizeof(MOVMuxContext), 2272 sizeof(MOVMuxContext),
2271 CODEC_ID_AAC, 2273 CODEC_ID_AAC,
2272 CODEC_ID_H264, 2274 CODEC_ID_H264,
2273 mov_write_header, 2275 mov_write_header,
2274 ff_mov_write_packet, 2276 ff_mov_write_packet,
2275 mov_write_trailer, 2277 mov_write_trailer,
2276 .flags = AVFMT_GLOBALHEADER, 2278 .flags = AVFMT_GLOBALHEADER,
2277 .codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0}, 2279 .codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0},
2278 }; 2280 };
2279 #endif 2281 #endif
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/mmst.c ('k') | source/patched-ffmpeg-mt/libavformat/oma.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698