diff options
author | wm4 <wm4@nowhere> | 2017-08-11 21:28:01 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-08-11 21:29:35 +0200 |
commit | c3916406451cddfb9daa42699dcd2163bff1a0eb (patch) | |
tree | bf2726829d142fdee6a62e3fb76549873a119e2e /common/playlist.h | |
parent | 8b1d4b978de855d62efd9c3f54216196e095b5bc (diff) | |
download | mpv-c3916406451cddfb9daa42699dcd2163bff1a0eb.tar.bz2 mpv-c3916406451cddfb9daa42699dcd2163bff1a0eb.tar.xz |
player: fix --lavfi-complex freeze
Commit 0e0b87b6f3297 fixed that dropped packets did not trigger further
work correctly. But it also made trivial --lavfi-complex freeze. The
reason is that the meaning if DATA_AGAIN was overloaded: the decoders
meant that they should be called again, while lavfi.c meant that other
outputs needed to be checked again. Rename the latter meaning to
DATA_STARVE, which means that the current input will deliver no more
data, until "other" work has been done (like reading other outputs, or
feeding input).
The decoders never return DATA_STARVE, because they don't get input from
the player core (instead, they get it from the demuxer directly, which
is why they still can return DATA_WAIT).
Also document the DATA_* semantics in the enum.
Fixes #4746.
Diffstat (limited to 'common/playlist.h')
0 files changed, 0 insertions, 0 deletions