[FFmpeg-cvslog] Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 27 14:21:13 2012 +0100| [577b39aea221ddc9606f3b5ca698516155cdfd43] | committer: Michael Niedermayer

Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8'

* commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8':
  h264: check ref_count validity for num_ref_idx_active_override_flag
  h264: add missing new line to log message
  dcadec: skip QMF on unused channels
  wavenc: write fact chunk sample count at the correct file position
  riff: do not add empty metadata tags in INFO chunk

Conflicts:
	libavcodec/dcadec.c
	libavcodec/h264.c
	libavformat/riff.c

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

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