[FFmpeg-cvslog] Merge commit '0db2d94280e260af5f3ad7993c5a6357462f17c9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep  6 16:05:40 2012 +0200| [376b16d7cc8a0953bc2054a6ccc778d75b7b1c5b] | committer: Michael Niedermayer

Merge commit '0db2d94280e260af5f3ad7993c5a6357462f17c9'

* commit '0db2d94280e260af5f3ad7993c5a6357462f17c9':
  dsputil: workaround __VA_ARGS__ missing tokenization for MSVC
  configure: add section for libc-specific hacks
  build: disable ranlib on mingw
  parser: Don't use pc as context for av_dlog
  h264: Remove an assert on current_picture_ptr being null

Conflicts:
	configure
	libavcodec/h264.c

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

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