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)
commit04dac5d1e00846610e65b928b2461eba39425613
tree1cafac12bdeda3647e11c4eaa8c1626de88bf221
parentf4332e959161ef7a58564104e092148ef7409d7d
parent85f947aefb3dae81f65f518acdffa8e31c679654
Merge commit '85f947aefb3dae81f65f518acdffa8e31c679654'

* commit '85f947aefb3dae81f65f518acdffa8e31c679654':
  lavc: remove a pointless check in decode_audio4()

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