summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-22 21:08:42 +0200
committerwm4 <wm4@nowhere>2014-07-22 21:08:42 +0200
commit104185052362fc196e4dd676b72f092ff63c6ba2 (patch)
treec9f441fbd52af0043023fdd5c0e9ca6ecb6bceac /common
parent8f8d5241122c0085dcd317c072b683eec0e7b353 (diff)
downloadmpv-104185052362fc196e4dd676b72f092ff63c6ba2.tar.bz2
mpv-104185052362fc196e4dd676b72f092ff63c6ba2.tar.xz
video: fix corner case with accidental EOF
The video flushing logic was broken: if there are no more packets, decode_image() will feed flush packets to the decoder. Even if an image was produced, it will return the demuxer EOF state, and since commit 7083f88c, this EOF state is returned to the caller, which is incorrect. Revert this part of the change, and explicitly check for VD_WAIT (the bogus change was intended to forward this error code to the caller). Also, turn the "r < 1" into something equivalent that doesn't rely on the exact value of VD_EOF. "r < 0" is ok, because at least here, errors are always negative.
Diffstat (limited to 'common')
0 files changed, 0 insertions, 0 deletions