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

Side by Side Diff: patched-ffmpeg-mt/libavcodec/mpeg4video_parser.c

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 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 * 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 #include "parser.h" 23 #include "parser.h"
24 #include "mpegvideo.h" 24 #include "mpegvideo.h"
25 #include "mpeg4video.h"
25 #include "mpeg4video_parser.h" 26 #include "mpeg4video_parser.h"
26 27
27 28
28 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){
29 int vop_found, i; 30 int vop_found, i;
30 uint32_t state; 31 uint32_t state;
31 32
32 vop_found= pc->frame_start_found; 33 vop_found= pc->frame_start_found;
33 state= pc->state; 34 state= pc->state;
34 35
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 130
130 131
131 AVCodecParser mpeg4video_parser = { 132 AVCodecParser mpeg4video_parser = {
132 { CODEC_ID_MPEG4 }, 133 { CODEC_ID_MPEG4 },
133 sizeof(ParseContext1), 134 sizeof(ParseContext1),
134 mpeg4video_parse_init, 135 mpeg4video_parse_init,
135 mpeg4video_parse, 136 mpeg4video_parse,
136 ff_parse1_close, 137 ff_parse1_close,
137 ff_mpeg4video_split, 138 ff_mpeg4video_split,
138 }; 139 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698