From: Michael Niedermayer <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
---
libavcodec/h264_slice.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index cce97d9..daa3737 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -985,6 +985,10 @@ static enum AVPixelFormat get_pixel_format(H264Context *h,
int force_callback)
for (i=0; choices[i] != AV_PIX_FMT_NONE; i++)
if (non_j_pixfmt(choices[i]) == non_j_pixfmt(h->avctx->pix_fmt) &&
!force_callback)
return choices[i];
+
+ if (!force_callback)
+ return AV_PIX_FMT_NONE;
+
return ff_thread_get_format(h->avctx, choices);
}
--
1.7.9.5
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
