Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 May 2013 08:34:26 +0000 (10:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 May 2013 08:41:43 +0000 (10:41 +0200)
* 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@gmx.at>
1  2 
libavcodec/bgmc.c
libavformat/nut.h
libavformat/nutdec.c
libavformat/nutenc.c

Simple merge
Simple merge
Simple merge
Simple merge