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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  7 14:05:29 2013 +0100| [1700be585593634c68fa7ccd193bfcb6b3c70822] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  oggdec: make sure the private parse data is cleaned up

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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