[FFmpeg-cvslog] Merge commit '9d18a7d3ec09d6d933d648570643fde924aa391a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan  5 02:25:03 2014 +0100| [a57da850c0ae7a9cde8917bb0f30dcee30b43439] | committer: Michael Niedermayer

Merge commit '9d18a7d3ec09d6d933d648570643fde924aa391a'

* commit '9d18a7d3ec09d6d933d648570643fde924aa391a':
  fate: Update AAC ELD 5.1 ref for recent bugfixes.

also reenable fate-aac-er_ad6000np_44_ep0, as this commit updates the pcm
reference, so that the test works again

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

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