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

Side by Side Diff: patched-ffmpeg-mt/libavcodec/mpeg4video.h

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 encoder/decoder internal header. 2 * MPEG4 encoder/decoder internal header.
3 * Copyright (c) 2000,2001 Fabrice Bellard 3 * Copyright (c) 2000,2001 Fabrice Bellard
4 * Copyright (c) 2002-2010 Michael Niedermayer <michaelni@gmx.at> 4 * Copyright (c) 2002-2010 Michael Niedermayer <michaelni@gmx.at>
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 #ifndef AVCODEC_MPEG4VIDEO_H 23 #ifndef AVCODEC_MPEG4VIDEO_H
24 #define AVCODEC_MPEG4VIDEO_H 24 #define AVCODEC_MPEG4VIDEO_H
25 25
26 #include <stdint.h>
27 #include "get_bits.h"
28 #include "mpegvideo.h"
29 #include "rl.h"
30
26 // shapes 31 // shapes
27 #define RECT_SHAPE 0 32 #define RECT_SHAPE 0
28 #define BIN_SHAPE 1 33 #define BIN_SHAPE 1
29 #define BIN_ONLY_SHAPE 2 34 #define BIN_ONLY_SHAPE 2
30 #define GRAY_SHAPE 3 35 #define GRAY_SHAPE 3
31 36
32 #define SIMPLE_VO_TYPE 1 37 #define SIMPLE_VO_TYPE 1
33 #define CORE_VO_TYPE 3 38 #define CORE_VO_TYPE 3
34 #define MAIN_VO_TYPE 4 39 #define MAIN_VO_TYPE 4
35 #define NBIT_VO_TYPE 5 40 #define NBIT_VO_TYPE 5
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 if(level<0) 196 if(level<0)
192 level=0; 197 level=0;
193 else if(!(s->workaround_bugs&FF_BUG_DC_CLIP)) 198 else if(!(s->workaround_bugs&FF_BUG_DC_CLIP))
194 level=2047; 199 level=2047;
195 } 200 }
196 dc_val[0]= level; 201 dc_val[0]= level;
197 202
198 return ret; 203 return ret;
199 } 204 }
200 #endif 205 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698