diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:17:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:17:49 +0100 |
| commit | 6c3e4e391dc881233e0cb96311da5a48a85a0eaf (patch) | |
| tree | 6e2f02bbca19aaa148c7d901e491d4afab4c63b4 /libavcodec/mpegvideo_enc.c | |
| parent | 72ad824a86233fb0c81a1581a1a7e6468dca6b0f (diff) | |
| parent | f08fefc4d099f2a1f2e3a6db3d340537e601f762 (diff) | |
| download | android_external_ffmpeg-6c3e4e391dc881233e0cb96311da5a48a85a0eaf.tar.gz android_external_ffmpeg-6c3e4e391dc881233e0cb96311da5a48a85a0eaf.tar.bz2 android_external_ffmpeg-6c3e4e391dc881233e0cb96311da5a48a85a0eaf.zip | |
Merge commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762'
* commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762':
h264: remove a useless svq3 condition
mpegvideo: remove FMT_H264
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 8858fd1f7d..42e4154fb3 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3398,8 +3398,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: av_assert0(0); } |