Merge commit '28eddef689f2b4843a84f7d05fd9614246f92cc4'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Apr 2015 19:57:12 +0000 (21:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Apr 2015 19:57:16 +0000 (21:57 +0200)
commit400810abee8fdf1a58ea852065b08e8ce1ca70c4
tree054b9c56995e7171230ac448af6399fa3a283e4e
parentb112e25dde39a86befaed7e294facd8d860322da
parent28eddef689f2b4843a84f7d05fd9614246f92cc4
Merge commit '28eddef689f2b4843a84f7d05fd9614246f92cc4'

* commit '28eddef689f2b4843a84f7d05fd9614246f92cc4':
  hq_hqa: Validate get_vlc2 return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hq_hqa.c