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

Side by Side Diff: source/patched-ffmpeg-mt/libavformat/flacdec.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 * Raw FLAC demuxer 2 * Raw FLAC demuxer
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.
11 * 11 *
12 * FFmpeg is distributed in the hope that it will be useful, 12 * FFmpeg is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Lesser General Public License for more details. 15 * Lesser General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Lesser General Public 17 * You should have received a copy of the GNU Lesser General Public
18 * License along with FFmpeg; if not, write to the Free Software 18 * License along with FFmpeg; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */ 20 */
21 21
22 #include "libavcodec/flac.h" 22 #include "libavcodec/flac.h"
23 #include "avformat.h" 23 #include "avformat.h"
24 #include "raw.h" 24 #include "rawdec.h"
25 #include "id3v2.h" 25 #include "id3v2.h"
26 #include "oggdec.h" 26 #include "oggdec.h"
27 #include "vorbiscomment.h" 27 #include "vorbiscomment.h"
28 28
29 static int flac_read_header(AVFormatContext *s, 29 static int flac_read_header(AVFormatContext *s,
30 AVFormatParameters *ap) 30 AVFormatParameters *ap)
31 { 31 {
32 uint8_t buf[ID3v2_HEADER_SIZE]; 32 uint8_t buf[ID3v2_HEADER_SIZE];
33 int ret, metadata_last=0, metadata_type, metadata_size, found_streaminfo=0; 33 int ret, metadata_last=0, metadata_type, metadata_size, found_streaminfo=0;
34 uint8_t header[4]; 34 uint8_t header[4];
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 NULL_IF_CONFIG_SMALL("raw FLAC"), 142 NULL_IF_CONFIG_SMALL("raw FLAC"),
143 0, 143 0,
144 flac_probe, 144 flac_probe,
145 flac_read_header, 145 flac_read_header,
146 ff_raw_read_partial_packet, 146 ff_raw_read_partial_packet,
147 .flags= AVFMT_GENERIC_INDEX, 147 .flags= AVFMT_GENERIC_INDEX,
148 .extensions = "flac", 148 .extensions = "flac",
149 .value = CODEC_ID_FLAC, 149 .value = CODEC_ID_FLAC,
150 .metadata_conv = ff_vorbiscomment_metadata_conv, 150 .metadata_conv = ff_vorbiscomment_metadata_conv,
151 }; 151 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/dtsdec.c ('k') | source/patched-ffmpeg-mt/libavformat/flvenc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698