Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 13:36:17 +0000 (14:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 13:43:32 +0000 (14:43 +0100)
commit329675cfd71fab29e47ea9c64f3560f0305dbf36
tree45b4e04ad5d38aa6bbb14cb9d75729d40db2abfd
parenta646ac8ef5c51d6a47eb564d58d04564c0489871
parenta1c525f7eb0783d31ba7a653865b6cbd3dc880de
Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'

* commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de':
  pcx: return meaningful error codes.
  tmv: return meaningful error codes.
  msrle: return meaningful error codes.
  cscd: return meaningful error codes.
  yadif: x86: fix build for compilers without aligned stack
  lavc: introduce the convenience function init_get_bits8
  lavc: check for overflow in init_get_bits

Conflicts:
libavcodec/cscd.c
libavcodec/pcx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cscd.c
libavcodec/get_bits.h
libavcodec/msrle.c
libavcodec/pcx.c
libavcodec/tmv.c
libavfilter/x86/yadif.asm