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

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/raw.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/libavcodec/psdata.c ('k') | source/patched-ffmpeg-mt/libavcodec/sbr.h » ('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 * Raw Video Codec 2 * Raw Video Codec
3 * Copyright (c) 2001 Fabrice Bellard 3 * Copyright (c) 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') }, 120 { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') },
121 { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') }, 121 { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') },
122 { PIX_FMT_PAL8, MKTAG('W', 'R', 'A', 'W') }, 122 { PIX_FMT_PAL8, MKTAG('W', 'R', 'A', 'W') },
123 { PIX_FMT_RGB555LE,MKTAG('L', '5', '5', '5') }, 123 { PIX_FMT_RGB555LE,MKTAG('L', '5', '5', '5') },
124 { PIX_FMT_RGB565LE,MKTAG('L', '5', '6', '5') }, 124 { PIX_FMT_RGB565LE,MKTAG('L', '5', '6', '5') },
125 { PIX_FMT_RGB565BE,MKTAG('B', '5', '6', '5') }, 125 { PIX_FMT_RGB565BE,MKTAG('B', '5', '6', '5') },
126 { PIX_FMT_BGR24, MKTAG('2', '4', 'B', 'G') }, 126 { PIX_FMT_BGR24, MKTAG('2', '4', 'B', 'G') },
127 { PIX_FMT_BGRA, MKTAG('B', 'G', 'R', 'A') }, 127 { PIX_FMT_BGRA, MKTAG('B', 'G', 'R', 'A') },
128 { PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') }, 128 { PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') },
129 { PIX_FMT_ABGR, MKTAG('A', 'B', 'G', 'R') }, 129 { PIX_FMT_ABGR, MKTAG('A', 'B', 'G', 'R') },
130 { PIX_FMT_GRAY16BE,MKTAG('b', '1', '6', 'g') },
131 { PIX_FMT_RGB48BE, MKTAG('b', '4', '8', 'r') },
130 132
131 /* special */ 133 /* special */
132 { PIX_FMT_RGB565LE,MKTAG( 3 , 0 , 0 , 0 ) }, /* flipped RGB565LE */ 134 { PIX_FMT_RGB565LE,MKTAG( 3 , 0 , 0 , 0 ) }, /* flipped RGB565LE */
133 135
134 { PIX_FMT_NONE, 0 }, 136 { PIX_FMT_NONE, 0 },
135 }; 137 };
136 138
137 unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat fmt) 139 unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat fmt)
138 { 140 {
139 const PixelFormatTag *tags = ff_raw_pix_fmt_tags; 141 const PixelFormatTag *tags = ff_raw_pix_fmt_tags;
140 while (tags->pix_fmt >= 0) { 142 while (tags->pix_fmt >= 0) {
141 if (tags->pix_fmt == fmt) 143 if (tags->pix_fmt == fmt)
142 return tags->fourcc; 144 return tags->fourcc;
143 tags++; 145 tags++;
144 } 146 }
145 return 0; 147 return 0;
146 } 148 }
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/psdata.c ('k') | source/patched-ffmpeg-mt/libavcodec/sbr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698