Skip to content
Snippets Groups Projects
user avatar
Michael Niedermayer authored
* commit '6e5cdf26':
  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: default avatarMichael Niedermayer <michaelni@gmx.at>
577b39ae
History