summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg12enc.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-01-22 10:56:42 +0100
committerAnton Khirnov <anton@khirnov.net>2012-01-27 10:38:33 +0100
commit9ce2a91b842bdb99fae0f153c5317d786a3f38d8 (patch)
tree1914932018cd340a8b0300a759454c7ac48f6ec7 /libavcodec/mpeg12enc.c
parent7232bfbd9345e12fe31b2cf0b4a813f4fb0961ab (diff)
downloadffmpeg-9ce2a91b842bdb99fae0f153c5317d786a3f38d8.tar.gz
lavc: remove disabled FF_API_MPEGVIDEO_GLOBAL_OPTS cruft.
Diffstat (limited to 'libavcodec/mpeg12enc.c')
-rw-r--r--libavcodec/mpeg12enc.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 17097db909..81d366d810 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -134,13 +134,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
if(MPV_encode_init(avctx) < 0)
return -1;
-#if FF_API_MPEGVIDEO_GLOBAL_OPTS
- if (avctx->flags2 & CODEC_FLAG2_DROP_FRAME_TIMECODE)
- s->drop_frame_timecode = 1;
- if (avctx->flags & CODEC_FLAG_SVCD_SCAN_OFFSET)
- s->scan_offset = 1;
-#endif
-
if(find_frame_rate_index(s) < 0){
if(s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
av_log(avctx, AV_LOG_ERROR, "MPEG1/2 does not support %d/%d fps\n", avctx->time_base.den, avctx->time_base.num);