summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-03-07 16:38:21 +0100
committerAnton Khirnov <anton@khirnov.net>2013-03-11 18:24:25 +0100
commit07054015cfe7df93abda8ac5ba1f5b5d0c44e499 (patch)
tree176833ee462c8fc860173876380845daa768988e /libavcodec
parentee8704916de79158da8a48a9ea5be819e83d23ba (diff)
downloadffmpeg-07054015cfe7df93abda8ac5ba1f5b5d0c44e499.tar.gz
mpegvideo: remove FMT_H264
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpegvideo.h1
-rw-r--r--libavcodec/mpegvideo_enc.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index e4a1356f11..ea08c14fed 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -49,7 +49,6 @@ enum OutputFormat {
FMT_H261,
FMT_H263,
FMT_MJPEG,
- FMT_H264,
};
#define MPEG_BUF_SIZE (16 * 1024)
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index f671460906..c4ce43fb17 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -3228,8 +3228,6 @@ static int encode_picture(MpegEncContext *s, int picture_number)
if (CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER)
ff_mpeg1_encode_picture_header(s, picture_number);
break;
- case FMT_H264:
- break;
default:
assert(0);
}