[FFmpeg-cvslog] avcodec/libx264: return error if unknown picture type encountered

Limin Wang git at videolan.org
Fri May 8 02:09:22 EEST 2020


ffmpeg | branch: master | Limin Wang <lance.lmwang at gmail.com> | Sat Apr 18 12:52:49 2020 +0800| [8b077511238e97d8657fb58551befc63cf5e29ed] | committer: Limin Wang

avcodec/libx264: return error if unknown picture type encountered

Signed-off-by: Limin Wang <lance.lmwang at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b077511238e97d8657fb58551befc63cf5e29ed
---

 libavcodec/libx264.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index c13e8a58d4..4121b2807a 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -476,7 +476,8 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame,
         pict_type = AV_PICTURE_TYPE_B;
         break;
     default:
-        pict_type = AV_PICTURE_TYPE_NONE;
+        av_log(ctx, AV_LOG_ERROR, "Unknown picture type encountered.\n");
+        return AVERROR_EXTERNAL;
     }
 #if FF_API_CODED_FRAME
 FF_DISABLE_DEPRECATION_WARNINGS



More information about the ffmpeg-cvslog mailing list