Merge commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Jan 2015 19:51:17 +0000 (20:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 9 Jan 2015 19:51:17 +0000 (20:51 +0100)
commit1cf0f27985965c28049b7a8481c859867dad3948
tree394a7626c12261e01aca83e2b147461df6b863ea
parentaefb99f2c0554a10f695eed569f0b94d7e462a34
parent7e4e010b80e76862e83afbd41c25d50e72f0b44c
Merge commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c'

* commit '7e4e010b80e76862e83afbd41c25d50e72f0b44c':
  mpeg4audio: check the init_get_bits() return value

Conflicts:
libavcodec/mpeg4audio.c

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