Merge commit '85f947aefb3dae81f65f518acdffa8e31c679654'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 15:13:37 +0000 (16:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 15:13:42 +0000 (16:13 +0100)
* commit '85f947aefb3dae81f65f518acdffa8e31c679654':
  lavc: remove a pointless check in decode_audio4()

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

Simple merge