diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-09-01 13:15:09 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-09-07 07:27:18 +0200 |
commit | 0635a8aa21d0495575c24f1883c1e6832d882657 (patch) | |
tree | bd2eec67ab06168fb23b4205022f68c20dfa96e3 /libavformat | |
parent | 7042337673ee75300a6f668fbcf3074213b06977 (diff) | |
download | ffmpeg-streaming-0635a8aa21d0495575c24f1883c1e6832d882657.zip ffmpeg-streaming-0635a8aa21d0495575c24f1883c1e6832d882657.tar.gz |
libx264: add 'partitions' private option
Deprecate AVCodecContext.partitions.
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/ffmdec.c | 1 | ||||
-rw-r--r-- | libavformat/ffmenc.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 07f7907..143f20b 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -344,7 +344,6 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap) codec->thread_count = avio_r8(pb); codec->coder_type = avio_rb32(pb); codec->me_cmp = avio_rb32(pb); - codec->partitions = avio_rb32(pb); codec->me_subpel_quality = avio_rb32(pb); codec->me_range = avio_rb32(pb); codec->keyint_min = avio_rb32(pb); diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index 07876cc..e9d2571 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -156,7 +156,6 @@ static int ffm_write_header(AVFormatContext *s) avio_w8(pb, codec->thread_count); avio_wb32(pb, codec->coder_type); avio_wb32(pb, codec->me_cmp); - avio_wb32(pb, codec->partitions); avio_wb32(pb, codec->me_subpel_quality); avio_wb32(pb, codec->me_range); avio_wb32(pb, codec->keyint_min); |