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/options_table.h | |
parent | b2d0c5bd13ab100a3acb18e9c869d73904e6e764 (diff) | |
parent | b85a5e87af4254b80913fe33591d96361f30832b (diff) | |
download | ffmpeg-streaming-25be63005f0ba0b4cb8bf2569202ad0e89b4dae3.zip ffmpeg-streaming-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/options_table.h')
-rw-r--r-- | libavcodec/options_table.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 764b5b1..33cb4b2 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -79,6 +79,7 @@ static const AVOption options[]={ {"sgop", "Deprecated, use mpegvideo private options instead", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_STRICT_GOP }, INT_MIN, INT_MAX, V|E, "flags2"}, #endif {"noout", "skip bitstream encoding", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_NO_OUTPUT }, INT_MIN, INT_MAX, V|E, "flags2"}, +{"ignorecrop", "ignore cropping information from sps", 1, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_IGNORE_CROP }, INT_MIN, INT_MAX, V|D, "flags2"}, {"local_header", "place global headers at every keyframe instead of in extradata", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_LOCAL_HEADER }, INT_MIN, INT_MAX, V|E, "flags2"}, {"chunks", "Frame data might be split into multiple chunks", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_CHUNKS }, INT_MIN, INT_MAX, V|D, "flags2"}, {"showall", "Show all frames before the first keyframe", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_SHOW_ALL }, INT_MIN, INT_MAX, V|D, "flags2"}, |