mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762'
* commit 'f08fefc4d099f2a1f2e3a6db3d340537e601f762': h264: remove a useless svq3 condition mpegvideo: remove FMT_H264 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
6c3e4e391d
|
@ -1882,11 +1882,8 @@ int ff_h264_frame_start(H264Context *h)
|
||||||
/* We mark the current picture as non-reference after allocating it, so
|
/* 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
|
* that if we break out due to an error it can be released automatically
|
||||||
* in the next ff_MPV_frame_start().
|
* 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
|
h->cur_pic_ptr->reference = 0;
|
||||||
* 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->field_poc[0] = h->cur_pic_ptr->field_poc[1] = INT_MAX;
|
h->cur_pic_ptr->field_poc[0] = h->cur_pic_ptr->field_poc[1] = INT_MAX;
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,6 @@ enum OutputFormat {
|
||||||
FMT_H261,
|
FMT_H261,
|
||||||
FMT_H263,
|
FMT_H263,
|
||||||
FMT_MJPEG,
|
FMT_MJPEG,
|
||||||
FMT_H264,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define MPEG_BUF_SIZE (16 * 1024)
|
#define MPEG_BUF_SIZE (16 * 1024)
|
||||||
|
|
|
@ -3398,8 +3398,6 @@ static int encode_picture(MpegEncContext *s, int picture_number)
|
||||||
if (CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER)
|
if (CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER)
|
||||||
ff_mpeg1_encode_picture_header(s, picture_number);
|
ff_mpeg1_encode_picture_header(s, picture_number);
|
||||||
break;
|
break;
|
||||||
case FMT_H264:
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
av_assert0(0);
|
av_assert0(0);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue