[FFmpeg-cvslog] Merge commit '85f947aefb3dae81f65f518acdffa8e31c679654'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  9 16:13:37 2013 +0100| [04dac5d1e00846610e65b928b2461eba39425613] | committer: Michael Niedermayer

Merge commit '85f947aefb3dae81f65f518acdffa8e31c679654'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04dac5d1e00846610e65b928b2461eba39425613
---