[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 19 11:11:14 2013 +0200| [54e718d014e07f3e13432a605c6aa91e3cdd5977] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=54e718d014e07f3e13432a605c6aa91e3cdd5977
---