]> git.sesse.net Git - ffmpeg/commit
Merge commit '82bd8a57692d8f3643ad0903c97e4a0f84393f53'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Feb 2015 11:56:56 +0000 (12:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Feb 2015 12:09:52 +0000 (13:09 +0100)
commit0afc26d330e6eff6221431bb93c69ed6bc6cc737
treecd63be57ddfad0356979ded380c4747d4ff74d88
parentadfe89bc48130e08953ea592b8937817f26cd8aa
parent82bd8a57692d8f3643ad0903c97e4a0f84393f53
Merge commit '82bd8a57692d8f3643ad0903c97e4a0f84393f53'

* commit '82bd8a57692d8f3643ad0903c97e4a0f84393f53':
  aacdec: Refactor decode_ics_info.

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