[FFmpeg-cvslog] Merge commit '37e69e2dee7c5167083bb42d669f73f038111a79' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 25 23:35:30 2013 +0200| [c6a4397410ab5f1b22cbc9f1ccb3126b3e5d6125] | committer: Michael Niedermayer

Merge commit '37e69e2dee7c5167083bb42d669f73f038111a79' into release/0.10

* commit '37e69e2dee7c5167083bb42d669f73f038111a79':
  ac3: Clean up the error paths
  ac3: Do not clash with normal AVERROR
  dxa: Make sure the reference frame exists
  h261: check the mtype index
  segafilm: Error out on impossible packet size
  ogg: Always alloc the private context in vorbis_header
  vc1: check mb_height validity.

Conflicts:
	libavcodec/h261dec.c

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

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