Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'

* commit '9f1223562e134bac6345a465870b9d56ff7d60cf': lavfi: connect libavresample options to af_resample via AVFilterGraph Conflicts: doc/APIchanges libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/version.h

Michael Niedermayer committed 13 years ago

Commit 71cf0942 parents f7c4b76 9f122355 files · +49 −3Browse files

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

Unified · Split

doc/APIchanges+4−0

@@ -138,6 +138,10 @@ API changes, most recent first: · 137 unmodified lines
138	138	2012-03-26 - a67d9cf - lavfi 2.66.100
139	139	Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
140	140
	141	+2013-xx-xx - xxxxxxx - lavfi 3.4.0 - avfiltergraph.h
	142	+ Add resample_lavr_opts to AVFilterGraph for setting libavresample options
	143	+ for auto-inserted resample filters.
	144	+
141	145	2013-xx-xx - xxxxxxx - lavu 52.7.0 - dict.h
142	146	Add av_dict_parse_string() to set multiple key/value pairs at once from a
143	147	string.

Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code