[FFmpeg-cvslog] Merge commit 'c443117f25e034c1e3ef35334b61b937e1e208ff'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 15:43:33 2013 +0200| [c3624cfe7638e41891cebf08c3381036adc8a9cd] | committer: Michael Niedermayer

Merge commit 'c443117f25e034c1e3ef35334b61b937e1e208ff'

* commit 'c443117f25e034c1e3ef35334b61b937e1e208ff':
  dsputil: Remove dct_bits

Conflicts:
	libavcodec/dsputil.c
	libavcodec/h264.c

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

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