Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Nov 2012 13:21:13 +0000 (14:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Nov 2012 13:31:04 +0000 (14:31 +0100)
commit577b39aea221ddc9606f3b5ca698516155cdfd43
tree115c086bc6eed1f4e60468c5ace8228c31c3cbf5
parentb4d4e51027e0c55e35c081cb180396ab04099b2f
parent6e5cdf26281945ddea3aaf5eca4d127791f23ca8
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@gmx.at>
libavcodec/dcadec.c
libavcodec/h264.c
libavformat/riff.c