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

Side by Side Diff: libavcodec/mpeg4video_parser.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 * MPEG4 Video frame extraction 2 * MPEG4 Video frame extraction
3 * Copyright (c) 2003 Fabrice Bellard 3 * Copyright (c) 2003 Fabrice Bellard
4 * Copyright (c) 2003 Michael Niedermayer 4 * Copyright (c) 2003 Michael Niedermayer
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 #define UNCHECKED_BITSTREAM_READER 1
24
25 #include "parser.h" 23 #include "parser.h"
26 #include "mpegvideo.h" 24 #include "mpegvideo.h"
27 #include "mpeg4video.h" 25 #include "mpeg4video.h"
28 #include "mpeg4video_parser.h" 26 #include "mpeg4video_parser.h"
29 27
30 28
31 int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){ 29 int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){
32 int vop_found, i; 30 int vop_found, i;
33 uint32_t state; 31 uint32_t state;
34 32
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 132
135 133
136 AVCodecParser ff_mpeg4video_parser = { 134 AVCodecParser ff_mpeg4video_parser = {
137 .codec_ids = { CODEC_ID_MPEG4 }, 135 .codec_ids = { CODEC_ID_MPEG4 },
138 .priv_data_size = sizeof(ParseContext1), 136 .priv_data_size = sizeof(ParseContext1),
139 .parser_init = mpeg4video_parse_init, 137 .parser_init = mpeg4video_parse_init,
140 .parser_parse = mpeg4video_parse, 138 .parser_parse = mpeg4video_parse,
141 .parser_close = ff_parse1_close, 139 .parser_close = ff_parse1_close,
142 .split = ff_mpeg4video_split, 140 .split = ff_mpeg4video_split,
143 }; 141 };
OLDNEW
« configure ('K') | « libavcodec/mpeg12.c ('k') | libavcodec/mpeg4videodec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698