summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-09-01 13:15:09 +0200
committerAnton Khirnov <anton@khirnov.net>2011-09-07 07:27:55 +0200
commit9c684feadc063473da3f9e341fa07e6c17b75154 (patch)
treeff9bf10a0243083a209197718658ff5c2a157d90 /libavformat
parent0635a8aa21d0495575c24f1883c1e6832d882657 (diff)
libx264: add 'direct-pred' private option
Deprecate AVCodecContext.directpred
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/ffmdec.c1
-rw-r--r--libavformat/ffmenc.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 143f20b5db..b9516d5b8b 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -353,7 +353,6 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
codec->qblur = av_int2dbl(avio_rb64(pb));
codec->max_qdiff = avio_rb32(pb);
codec->refs = avio_rb32(pb);
- codec->directpred = avio_rb32(pb);
break;
case AVMEDIA_TYPE_AUDIO:
codec->sample_rate = avio_rb32(pb);
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c
index e9d25717b8..4bfae693e5 100644
--- a/libavformat/ffmenc.c
+++ b/libavformat/ffmenc.c
@@ -165,7 +165,6 @@ static int ffm_write_header(AVFormatContext *s)
avio_wb64(pb, av_dbl2int(codec->qblur));
avio_wb32(pb, codec->max_qdiff);
avio_wb32(pb, codec->refs);
- avio_wb32(pb, codec->directpred);
break;
case AVMEDIA_TYPE_AUDIO:
avio_wb32(pb, codec->sample_rate);