[FFmpeg-cvslog] Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May  6 10:34:26 2013 +0200| [77c85cbd9d4dd17c8b8966cec252f89351634d27] | committer: Michael Niedermayer

Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'

* commit '46c1917350f58dfab84e41919e6c02d43950db8c':
  nut: use a define for the nut version
  bgmc: Do not mark ff_bgmc_decode_init() as av_cold

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

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