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

Side by Side Diff: source/patched-ffmpeg-mt/libavformat/rsodec.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
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/riff.c ('k') | source/patched-ffmpeg-mt/libavformat/rtp.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 * RSO demuxer 2 * RSO demuxer
3 * Copyright (c) 2001 Fabrice Bellard (original AU code) 3 * Copyright (c) 2001 Fabrice Bellard (original AU code)
4 * Copyright (c) 2010 Rafael Carre 4 * Copyright (c) 2010 Rafael Carre
5 * 5 *
6 * This file is part of FFmpeg. 6 * This file is part of FFmpeg.
7 * 7 *
8 * FFmpeg is free software; you can redistribute it and/or 8 * FFmpeg is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
11 * version 2.1 of the License, or (at your option) any later version. 11 * version 2.1 of the License, or (at your option) any later version.
12 * 12 *
13 * FFmpeg is distributed in the hope that it will be useful, 13 * FFmpeg is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Lesser General Public License for more details. 16 * Lesser General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU Lesser General Public 18 * You should have received a copy of the GNU Lesser General Public
19 * License along with FFmpeg; if not, write to the Free Software 19 * License along with FFmpeg; if not, write to the Free Software
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 */ 21 */
22 22
23 #include "libavutil/intreadwrite.h" 23 #include "libavutil/intreadwrite.h"
24 #include "avformat.h" 24 #include "avformat.h"
25 #include "internal.h" 25 #include "internal.h"
26 #include "raw.h" 26 #include "pcm.h"
27 #include "riff.h" 27 #include "riff.h"
28 #include "rso.h" 28 #include "rso.h"
29 29
30 static int rso_read_header(AVFormatContext *s, AVFormatParameters *ap) 30 static int rso_read_header(AVFormatContext *s, AVFormatParameters *ap)
31 { 31 {
32 ByteIOContext *pb = s->pb; 32 ByteIOContext *pb = s->pb;
33 int id, rate, bps; 33 int id, rate, bps;
34 unsigned int size; 34 unsigned int size;
35 enum CodecID codec; 35 enum CodecID codec;
36 AVStream *st; 36 AVStream *st;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"), 93 .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
94 .extensions = "rso", 94 .extensions = "rso",
95 .priv_data_size = 0, 95 .priv_data_size = 0,
96 .read_probe = NULL, /* no magic value in this format */ 96 .read_probe = NULL, /* no magic value in this format */
97 .read_header = rso_read_header, 97 .read_header = rso_read_header,
98 .read_packet = rso_read_packet, 98 .read_packet = rso_read_packet,
99 .read_close = NULL, 99 .read_close = NULL,
100 .read_seek = pcm_read_seek, 100 .read_seek = pcm_read_seek,
101 .codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0}, 101 .codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0},
102 }; 102 };
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/riff.c ('k') | source/patched-ffmpeg-mt/libavformat/rtp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698