Skip to content
Snippets Groups Projects
Commit 70a65eca authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '9a7b5688'


* commit '9a7b5688':
  au: set bit rate
  au: validate bits-per-sample separately from codec tag
  rtpdec_vp8: Mark broken packets with AV_PKT_FLAG_CORRUPT

Conflicts:
	libavformat/au.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents f023003c 9a7b5688
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment