Fix bug #1302: Unsupported pixel format crash.

3 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c198076..747f46c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 User johns
 Date:
 
+    Fix bug #1302: Unsupported pixel format crash.
     Fix the fix, when sillpicture is called in suspend mode.
     Fix crash, when sillpicture is called in suspend mode.
     Add workaround for zero width+height and ffmpeg >= 1.2.
diff --git a/Todo b/Todo
index 290f6eb..e6c4996 100644
--- a/Todo
+++ b/Todo
@@ -40,6 +40,7 @@ video:
     check start with 24Hz display rate
     crash with ffmpeg without vaapi and vdpau.
     still-picture of PES recordings should use VideoMpegEnqueue.
+    convert PIX_FMT_... PixelFormat to new names AV_PIX_FMT_..., AVPixelFormat.
 
 vdpau:
     software deinterlace path not working.
diff --git a/video.c b/video.c
index 878eba9..6f3806d 100644
--- a/video.c
+++ b/video.c
@@ -2311,6 +2311,7 @@ static int VaapiFindImageFormat(VaapiDecoder * decoder,
 	    // intel: I420 is native format for MPEG-2 decoded surfaces
 	    // intel: NV12 is native format for H.264 decoded surfaces
 	case PIX_FMT_YUV420P:
+	case PIX_FMT_YUVJ420P:
 	    // fourcc = VA_FOURCC_YV12; // YVU
 	    fourcc = VA_FOURCC('I', '4', '2', '0');	// YUV
 	    break;
@@ -7583,6 +7584,7 @@ static void VdpauRenderFrame(VdpauDecoder * decoder,
 	//
 	switch (video_ctx->pix_fmt) {
 	    case PIX_FMT_YUV420P:
+	    case PIX_FMT_YUVJ420P:	// some streams produce this
 		break;
 	    case PIX_FMT_YUV422P:
 	    case PIX_FMT_YUV444P: