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

Merge commit '910247f1' 


* commit '910247f1':
  lavc: Deprecate avctx.{inter,intra}_quant_bias

Conflicts:
	libavcodec/mpegvideo_enc.c
	libavcodec/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents e15e78f3 910247f1
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment