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

Side by Side Diff: source/patched-ffmpeg-mt/libavformat/isom.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, 5 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
OLDNEW
1 /* 1 /*
2 * ISO Media common code 2 * ISO Media common code
3 * Copyright (c) 2001 Fabrice Bellard 3 * Copyright (c) 2001 Fabrice Bellard
4 * Copyright (c) 2002 Francois Revol <revol@free.fr> 4 * Copyright (c) 2002 Francois Revol <revol@free.fr>
5 * Copyright (c) 2006 Baptiste Coudurier <baptiste.coudurier@free.fr> 5 * Copyright (c) 2006 Baptiste Coudurier <baptiste.coudurier@free.fr>
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */ 67 { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */
68 { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2vuy but byte s wapped */ 68 { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2vuy but byte s wapped */
69 69
70 { CODEC_ID_RAWVIDEO, MKTAG('L', '5', '5', '5') }, 70 { CODEC_ID_RAWVIDEO, MKTAG('L', '5', '5', '5') },
71 { CODEC_ID_RAWVIDEO, MKTAG('L', '5', '6', '5') }, 71 { CODEC_ID_RAWVIDEO, MKTAG('L', '5', '6', '5') },
72 { CODEC_ID_RAWVIDEO, MKTAG('B', '5', '6', '5') }, 72 { CODEC_ID_RAWVIDEO, MKTAG('B', '5', '6', '5') },
73 { CODEC_ID_RAWVIDEO, MKTAG('2', '4', 'B', 'G') }, 73 { CODEC_ID_RAWVIDEO, MKTAG('2', '4', 'B', 'G') },
74 { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') }, 74 { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') },
75 { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') }, 75 { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') },
76 { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') }, 76 { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
77 { CODEC_ID_RAWVIDEO, MKTAG('b', '1', '6', 'g') },
78 { CODEC_ID_RAWVIDEO, MKTAG('b', '4', '8', 'r') },
77 79
78 { CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */ 80 { CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */
79 { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */ 81 { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */
80 82
81 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */ 83 { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
82 { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */ 84 { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */
83 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with alpha-channel (AVID JFIF meridien compressed) */ 85 { CODEC_ID_MJPEG, MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with alpha-channel (AVID JFIF meridien compressed) */
84 /* { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with alpha-channe l (AVID ABVB/Truevision NuVista) */ 86 /* { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with alpha-channe l (AVID ABVB/Truevision NuVista) */
85 { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, /* Motion JPEG OpenDML */ 87 { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, /* Motion JPEG OpenDML */
86 { CODEC_ID_MJPEGB, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */ 88 { CODEC_ID_MJPEGB, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 return 1; 317 return 1;
316 } 318 }
317 /* old fashion apple lang code */ 319 /* old fashion apple lang code */
318 if (code >= FF_ARRAY_ELEMS(mov_mdhd_language_map)) 320 if (code >= FF_ARRAY_ELEMS(mov_mdhd_language_map))
319 return 0; 321 return 0;
320 if (!mov_mdhd_language_map[code][0]) 322 if (!mov_mdhd_language_map[code][0])
321 return 0; 323 return 0;
322 memcpy(to, mov_mdhd_language_map[code], 4); 324 memcpy(to, mov_mdhd_language_map[code], 4);
323 return 1; 325 return 1;
324 } 326 }
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/internal.h ('k') | source/patched-ffmpeg-mt/libavformat/matroskadec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698