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 | |
| parent | 72ad824a86233fb0c81a1581a1a7e6468dca6b0f (diff) | |
| parent | f08fefc4d099f2a1f2e3a6db3d340537e601f762 (diff) | |
Merge commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762'
* commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762':
h264: remove a useless svq3 condition
mpegvideo: remove FMT_H264
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 7 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 4e16d5e896..dec428965b 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1882,11 +1882,8 @@ int ff_h264_frame_start(H264Context *h) /* We mark the current picture as non-reference after allocating it, so * that if we break out due to an error it can be released automatically * in the next ff_MPV_frame_start(). - * SVQ3 as well as most other codecs have only last/next/current and thus - * get released even with set reference, besides SVQ3 and others do not - * mark frames as reference later "naturally". */ - if (h->avctx->codec_id != AV_CODEC_ID_SVQ3) - h->cur_pic_ptr->reference = 0; + */ + h->cur_pic_ptr->reference = 0; h->cur_pic_ptr->field_poc[0] = h->cur_pic_ptr->field_poc[1] = INT_MAX; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 012e03cd45..8cc50395c9 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -52,7 +52,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 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); } |