Merge commit '0f678c0214dccb355ed8955077a2bea46984fbc8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 12:33:25 +0000 (14:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 12:33:49 +0000 (14:33 +0200)
* commit '0f678c0214dccb355ed8955077a2bea46984fbc8':
  aic: Validate values read from the bitstream

Conflicts:
libavcodec/aic.c

See: 657875b145c788d29b8e3bf38f79264e657932ae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/aic.c

Simple merge