[FFmpeg-cvslog] Merge commit '89b51b570daa80e6e3790fcd449fe61fc5574e07'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  7 13:32:54 2013 +0100| [2db8660f094ab15ce15f024f97134440a3654932] | committer: Michael Niedermayer

Merge commit '89b51b570daa80e6e3790fcd449fe61fc5574e07'

* commit '89b51b570daa80e6e3790fcd449fe61fc5574e07':
  oggdec: free the ogg streams on read_header failure

Conflicts:
	libavformat/oggdec.c

Original commit this was based on: (this merge just moves the function up)
commit 07a866282f08985c65c47ebabcf7b20f1c46daa0
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Nov 20 15:12:37 2012 +0100

    oggdec: fix memleak on header parsing failure

    Fixes Ticket1931

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

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