Merge commit '37e69e2dee7c5167083bb42d669f73f038111a79' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 21:35:30 +0000 (23:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 21:35:30 +0000 (23:35 +0200)
commitc6a4397410ab5f1b22cbc9f1ccb3126b3e5d6125
treec454ad645169a69a422cae0f1fa30f9188c50d7c
parent210a437e105fbd92f1dd9c2c82f4a5efd80ca8fd
parent37e69e2dee7c5167083bb42d669f73f038111a79
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@gmx.at>
libavcodec/aac_ac3_parser.h
libavcodec/ac3dec.c
libavcodec/dxa.c
libavcodec/h261dec.c
libavcodec/vc1dec.c
libavformat/segafilm.c