| Message ID | AS8P250MB0744AD104F8CCF3460908B668FC9A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | c77aee61b8cb60934fc6f3939e2bfbb477cc67a7 |
| Headers | show |
| Series | [FFmpeg-devel,01/13] avcodec/mpegvideo_enc: Fix abort on allocation errors | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
On Fri, Oct 06, 2023 at 04:46:35AM +0200, Andreas Rheinhardt wrote: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/mpegpicture.c | 2 -- > libavcodec/mpegvideo_dec.c | 2 ++ > 2 files changed, 2 insertions(+), 2 deletions(-) ok thx [...]
diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index 44c4c8fe93..f859f163a6 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -252,8 +252,6 @@ fail: void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *pic) { pic->tf.f = pic->f; - /* WM Image / Screen codecs allocate internal buffers with different - * dimensions / colorspaces; ignore user-defined callbacks for these. */ if (avctx->codec_id != AV_CODEC_ID_WMV3IMAGE && avctx->codec_id != AV_CODEC_ID_VC1IMAGE && avctx->codec_id != AV_CODEC_ID_MSS2) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 4e00137cbb..7a9101a781 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -242,6 +242,8 @@ static int alloc_picture(MpegEncContext *s, Picture *pic) pic->tf.f = pic->f; + /* WM Image / Screen codecs allocate internal buffers with different + * dimensions / colorspaces; ignore user-defined callbacks for these. */ if (avctx->codec_id != AV_CODEC_ID_WMV3IMAGE && avctx->codec_id != AV_CODEC_ID_VC1IMAGE && avctx->codec_id != AV_CODEC_ID_MSS2) {
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/mpegpicture.c | 2 -- libavcodec/mpegvideo_dec.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)