Merge remote-tracking branch 'qatar/master'
* qatar/master:
ogg: Fix potential infinite discard loop
No change as this commit has been part of ffmpeg since a while already
See: d7b542ae294aaf818f2a00c5606e009cf931e77c
Merged-by: Michael Niedermayer <michaelni@gmx.at>