[FFmpeg-cvslog] Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  9 22:37:42 2014 +0200| [e932ae5940562ae0a183687053a5457a76fd1fa9] | committer: Michael Niedermayer

Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'

* commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6':
  adxdec: get rid of an avpriv function

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

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