diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 14:36:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 14:36:45 +0100 |
| commit | 25be63005f0ba0b4cb8bf2569202ad0e89b4dae3 (patch) | |
| tree | 43bf6b49aa89942207f0937cfcab374524795a8f /libavcodec/avcodec.h | |
| parent | b2d0c5bd13ab100a3acb18e9c869d73904e6e764 (diff) | |
| parent | b85a5e87af4254b80913fe33591d96361f30832b (diff) | |
| download | ffmpeg-25be63005f0ba0b4cb8bf2569202ad0e89b4dae3.tar.gz | |
Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'
* commit 'b85a5e87af4254b80913fe33591d96361f30832b':
lavu: Add av_strnstr()
h264: Allow discarding the cropping information from SPS
Conflicts:
Changelog
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c3b1b6ac6b..ca7764a8ba 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -713,6 +713,8 @@ typedef struct RcOverride{ #define CODEC_FLAG2_NO_OUTPUT 0x00000004 ///< Skip bitstream encoding. #define CODEC_FLAG2_LOCAL_HEADER 0x00000008 ///< Place global headers at every keyframe instead of in extradata. #define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format. DEPRECATED!!!! +#define CODEC_FLAG2_IGNORE_CROP 0x00010000 ///< Discard cropping information from SPS. + #if FF_API_MPV_GLOBAL_OPTS #define CODEC_FLAG_CBP_RD 0x04000000 ///< Use rate distortion optimization for cbp. #define CODEC_FLAG_QP_RD 0x08000000 ///< Use rate distortion optimization for qp selectioon. |