Commit e5bae39f authored 9 years ago by Michael Niedermayer

Merge commit '5d3addb9'


* commit '5d3addb9':
  Add a quality factor packet side data

Conflicts:
	doc/APIchanges
	ffmpeg.c
	libavcodec/avcodec.h
	libavcodec/mpegvideo_enc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

parents b1fad7ac 5d3addb9

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing with 67 additions and 7 deletions

Please register or to comment