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

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

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 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 * Register all the formats and protocols 2 * Register all the formats and protocols
3 * Copyright (c) 2000, 2001, 2002 Fabrice Bellard 3 * Copyright (c) 2000, 2001, 2002 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 29 matching lines...) Expand all
40 { 40 {
41 static int initialized; 41 static int initialized;
42 42
43 if (initialized) 43 if (initialized)
44 return; 44 return;
45 initialized = 1; 45 initialized = 1;
46 46
47 avcodec_register_all(); 47 avcodec_register_all();
48 48
49 /* (de)muxers */ 49 /* (de)muxers */
50 REGISTER_MUXER (A64, a64);
50 REGISTER_DEMUXER (AAC, aac); 51 REGISTER_DEMUXER (AAC, aac);
51 REGISTER_MUXDEMUX (AC3, ac3); 52 REGISTER_MUXDEMUX (AC3, ac3);
52 REGISTER_MUXER (ADTS, adts); 53 REGISTER_MUXER (ADTS, adts);
53 REGISTER_DEMUXER (AEA, aea); 54 REGISTER_DEMUXER (AEA, aea);
54 REGISTER_MUXDEMUX (AIFF, aiff); 55 REGISTER_MUXDEMUX (AIFF, aiff);
55 REGISTER_MUXDEMUX (AMR, amr); 56 REGISTER_MUXDEMUX (AMR, amr);
56 REGISTER_DEMUXER (ANM, anm); 57 REGISTER_DEMUXER (ANM, anm);
57 REGISTER_DEMUXER (APC, apc); 58 REGISTER_DEMUXER (APC, apc);
58 REGISTER_DEMUXER (APE, ape); 59 REGISTER_DEMUXER (APE, ape);
60 REGISTER_DEMUXER (APPLEHTTP, applehttp);
59 REGISTER_MUXDEMUX (ASF, asf); 61 REGISTER_MUXDEMUX (ASF, asf);
60 REGISTER_MUXDEMUX (ASS, ass); 62 REGISTER_MUXDEMUX (ASS, ass);
61 REGISTER_MUXER (ASF_STREAM, asf_stream); 63 REGISTER_MUXER (ASF_STREAM, asf_stream);
62 REGISTER_MUXDEMUX (AU, au); 64 REGISTER_MUXDEMUX (AU, au);
63 REGISTER_MUXDEMUX (AVI, avi); 65 REGISTER_MUXDEMUX (AVI, avi);
64 REGISTER_DEMUXER (AVISYNTH, avisynth); 66 REGISTER_DEMUXER (AVISYNTH, avisynth);
65 REGISTER_MUXER (AVM2, avm2); 67 REGISTER_MUXER (AVM2, avm2);
66 REGISTER_DEMUXER (AVS, avs); 68 REGISTER_DEMUXER (AVS, avs);
67 REGISTER_DEMUXER (BETHSOFTVID, bethsoftvid); 69 REGISTER_DEMUXER (BETHSOFTVID, bethsoftvid);
68 REGISTER_DEMUXER (BFI, bfi); 70 REGISTER_DEMUXER (BFI, bfi);
(...skipping 14 matching lines...) Expand all
83 REGISTER_DEMUXER (EA_CDATA, ea_cdata); 85 REGISTER_DEMUXER (EA_CDATA, ea_cdata);
84 REGISTER_MUXDEMUX (EAC3, eac3); 86 REGISTER_MUXDEMUX (EAC3, eac3);
85 REGISTER_MUXDEMUX (FFM, ffm); 87 REGISTER_MUXDEMUX (FFM, ffm);
86 REGISTER_MUXDEMUX (FILMSTRIP, filmstrip); 88 REGISTER_MUXDEMUX (FILMSTRIP, filmstrip);
87 REGISTER_MUXDEMUX (FLAC, flac); 89 REGISTER_MUXDEMUX (FLAC, flac);
88 REGISTER_DEMUXER (FLIC, flic); 90 REGISTER_DEMUXER (FLIC, flic);
89 REGISTER_MUXDEMUX (FLV, flv); 91 REGISTER_MUXDEMUX (FLV, flv);
90 REGISTER_DEMUXER (FOURXM, fourxm); 92 REGISTER_DEMUXER (FOURXM, fourxm);
91 REGISTER_MUXER (FRAMECRC, framecrc); 93 REGISTER_MUXER (FRAMECRC, framecrc);
92 REGISTER_MUXER (FRAMEMD5, framemd5); 94 REGISTER_MUXER (FRAMEMD5, framemd5);
95 REGISTER_MUXDEMUX (G722, g722);
93 REGISTER_MUXER (GIF, gif); 96 REGISTER_MUXER (GIF, gif);
94 REGISTER_DEMUXER (GSM, gsm); 97 REGISTER_DEMUXER (GSM, gsm);
95 REGISTER_MUXDEMUX (GXF, gxf); 98 REGISTER_MUXDEMUX (GXF, gxf);
96 REGISTER_MUXDEMUX (H261, h261); 99 REGISTER_MUXDEMUX (H261, h261);
97 REGISTER_MUXDEMUX (H263, h263); 100 REGISTER_MUXDEMUX (H263, h263);
98 REGISTER_MUXDEMUX (H264, h264); 101 REGISTER_MUXDEMUX (H264, h264);
99 REGISTER_DEMUXER (IDCIN, idcin); 102 REGISTER_DEMUXER (IDCIN, idcin);
100 REGISTER_DEMUXER (IFF, iff); 103 REGISTER_DEMUXER (IFF, iff);
101 REGISTER_MUXDEMUX (IMAGE2, image2); 104 REGISTER_MUXDEMUX (IMAGE2, image2);
102 REGISTER_MUXDEMUX (IMAGE2PIPE, image2pipe); 105 REGISTER_MUXDEMUX (IMAGE2PIPE, image2pipe);
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe); 221 REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe);
219 222
220 /* external libraries */ 223 /* external libraries */
221 REGISTER_MUXDEMUX (LIBNUT, libnut); 224 REGISTER_MUXDEMUX (LIBNUT, libnut);
222 225
223 /* protocols */ 226 /* protocols */
224 REGISTER_PROTOCOL (CONCAT, concat); 227 REGISTER_PROTOCOL (CONCAT, concat);
225 REGISTER_PROTOCOL (FILE, file); 228 REGISTER_PROTOCOL (FILE, file);
226 REGISTER_PROTOCOL (GOPHER, gopher); 229 REGISTER_PROTOCOL (GOPHER, gopher);
227 REGISTER_PROTOCOL (HTTP, http); 230 REGISTER_PROTOCOL (HTTP, http);
231 REGISTER_PROTOCOL (MMSH, mmsh);
228 REGISTER_PROTOCOL (MMST, mmst); 232 REGISTER_PROTOCOL (MMST, mmst);
229 REGISTER_PROTOCOL (MD5, md5); 233 REGISTER_PROTOCOL (MD5, md5);
230 REGISTER_PROTOCOL (PIPE, pipe); 234 REGISTER_PROTOCOL (PIPE, pipe);
231 REGISTER_PROTOCOL (RTMP, rtmp); 235 REGISTER_PROTOCOL (RTMP, rtmp);
232 #if CONFIG_LIBRTMP 236 #if CONFIG_LIBRTMP
233 REGISTER_PROTOCOL (RTMP, rtmpt); 237 REGISTER_PROTOCOL (RTMP, rtmpt);
234 REGISTER_PROTOCOL (RTMP, rtmpe); 238 REGISTER_PROTOCOL (RTMP, rtmpe);
235 REGISTER_PROTOCOL (RTMP, rtmpte); 239 REGISTER_PROTOCOL (RTMP, rtmpte);
236 REGISTER_PROTOCOL (RTMP, rtmps); 240 REGISTER_PROTOCOL (RTMP, rtmps);
237 #endif 241 #endif
238 REGISTER_PROTOCOL (RTP, rtp); 242 REGISTER_PROTOCOL (RTP, rtp);
239 REGISTER_PROTOCOL (TCP, tcp); 243 REGISTER_PROTOCOL (TCP, tcp);
240 REGISTER_PROTOCOL (UDP, udp); 244 REGISTER_PROTOCOL (UDP, udp);
241 } 245 }
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/aiffdec.c ('k') | source/patched-ffmpeg-mt/libavformat/amr.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698