Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 Aug 2013 09:11:14 +0000 (11:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 Aug 2013 09:22:26 +0000 (11:22 +0200)
commit54e718d014e07f3e13432a605c6aa91e3cdd5977
tree78dbee55e6c7f1fa4ae39219ec21cff983ade869
parent037af63b33730808a89ecb5eab156b44c5018f30
parent9a27acae9e6b7d0bf74c5b878af9c42495a546f3
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>