[FFmpeg-cvslog] Merge commit '6a5bfd4d49e7433f6de869ccfe682940dbca8740'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct  4 11:21:50 2013 +0200| [8378aae7293575cecad9cccb23226708e2303ccf] | committer: Michael Niedermayer

Merge commit '6a5bfd4d49e7433f6de869ccfe682940dbca8740'

* commit '6a5bfd4d49e7433f6de869ccfe682940dbca8740':
  atrac: Add missing av_cold

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

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