Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'

* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b': Add a quality factor packet side data Conflicts: doc/APIchanges ffmpeg.c libavcodec/avcodec.h libavcodec/mpegvideo_enc.c libavcodec/version.h

Michael Niedermayer committed 11 years ago

Commit e5bae392 parents b1fad7a 5d3addb12 files · +67 −7Browse files

Showing the changes to doc/APIchanges (1 of 12 files). Show all

Unified · Split

doc/APIchanges+3−0

@@ -15,6 +15,9 @@ libavutil: 2014-08-09 · 14 unmodified lines
15	15
16	16	API changes, most recent first:
17	17
	18	+2015-xx-xx - xxxxxxx - lavc 56.33.0 - avcodec.h
	19	+ Add AV_PKT_DATA_QUALITY_FACTOR to export the quality value of an AVPacket.
	20	+
18	21	2015-07-16 - xxxxxxxx - lavc 56.49.100
19	22	Add av_codec_get_codec_properties(), FF_CODEC_PROPERTY_LOSSLESS
20	23	and FF_CODEC_PROPERTY_CLOSED_CAPTIONS

Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code