diff options
author | wm4 <wm4@nowhere> | 2015-09-28 22:27:41 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-09-28 22:31:47 +0200 |
commit | 12cd48a8a9be94612a6645f27fc971d0aac985ff (patch) | |
tree | 3bddc3c1c1244bde4324db06070850d17115c4c1 | |
parent | 31316e9ca0f7f00b8e83dfb8f9a22c2f6a28141f (diff) | |
download | mpv-12cd48a8a9be94612a6645f27fc971d0aac985ff.tar.bz2 mpv-12cd48a8a9be94612a6645f27fc971d0aac985ff.tar.xz |
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.
-rw-r--r-- | video/decode/vd_lavc.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; } |