From 12cd48a8a9be94612a6645f27fc971d0aac985ff Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 28 Sep 2015 22:27:41 +0200 Subject: Revert "vd_lavc: do not abort hardware decoding on errors" This essentially reverts commit 009dfbe3. FFmpeg VideoToolbox support is being wacky, and can cause major issues, such as not being able to decode a single frame. (E.g. by playing a .ts file. This should be fixed in FFmpeg eventually.) This is not a straight revert of the commit; just a functional one. We keep the slightly simpler code structure. --- video/decode/vd_lavc.c | 1 + 1 file changed, 1 insertion(+) (limited to 'video') diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index c4d4344f47..e5ce92addb 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -627,6 +627,7 @@ static void decode(struct dec_video *vd, struct demux_packet *packet, if (ctx->hwdec_failed || ret < 0) { if (ret < 0) MP_WARN(vd, "Error while decoding frame!\n"); + ctx->hwdec_failed = true; return; } -- cgit v1.2.3