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

Side by Side Diff: libavcodec/mpegaudiodec.c

Issue 9370003: Remove pthreads patch, roll in new patches, disable unchecked bit readers. (Closed) Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master
Patch Set: gyp fix. Created 8 years, 10 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
OLDNEW
1 /* 1 /*
2 * MPEG Audio decoder 2 * MPEG Audio decoder
3 * Copyright (c) 2001, 2002 Fabrice Bellard 3 * Copyright (c) 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.
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 /** 22 /**
23 * @file 23 * @file
24 * MPEG Audio decoder 24 * MPEG Audio decoder
25 */ 25 */
26 26
27 #define UNCHECKED_BITSTREAM_READER 1
28
29 #include "libavutil/audioconvert.h" 27 #include "libavutil/audioconvert.h"
30 #include "avcodec.h" 28 #include "avcodec.h"
31 #include "get_bits.h" 29 #include "get_bits.h"
32 #include "mathops.h" 30 #include "mathops.h"
33 #include "mpegaudiodsp.h" 31 #include "mpegaudiodsp.h"
34 32
35 /* 33 /*
36 * TODO: 34 * TODO:
37 * - test lsf / mpeg25 extensively. 35 * - test lsf / mpeg25 extensively.
38 */ 36 */
(...skipping 1986 matching lines...) Expand 10 before | Expand all | Expand 10 after
2025 .priv_data_size = sizeof(MP3On4DecodeContext), 2023 .priv_data_size = sizeof(MP3On4DecodeContext),
2026 .init = decode_init_mp3on4, 2024 .init = decode_init_mp3on4,
2027 .close = decode_close_mp3on4, 2025 .close = decode_close_mp3on4,
2028 .decode = decode_frame_mp3on4, 2026 .decode = decode_frame_mp3on4,
2029 .capabilities = CODEC_CAP_DR1, 2027 .capabilities = CODEC_CAP_DR1,
2030 .flush = flush_mp3on4, 2028 .flush = flush_mp3on4,
2031 .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"), 2029 .long_name = NULL_IF_CONFIG_SMALL("MP3onMP4"),
2032 }; 2030 };
2033 #endif 2031 #endif
2034 #endif 2032 #endif
OLDNEW
« configure ('K') | « libavcodec/mpeg4videodec.c ('k') | libavcodec/wmavoice.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698