diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 20:10:55 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 20:10:55 +0400 |
commit | 71cf094e1be086bce4c535b1fe0d96a0449486ae (patch) | |
tree | c1608e1f7216f00ac1485e6ee6a911ecfbcc0a52 /doc | |
parent | f7c4b76c488b4901133addb3f7875ef3ac4ae9c4 (diff) | |
parent | 9f1223562e134bac6345a465870b9d56ff7d60cf (diff) |
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
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/APIchanges | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 662dc8a409..ca52aa4eef 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -138,6 +138,10 @@ API changes, most recent first: 2012-03-26 - a67d9cf - lavfi 2.66.100 Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions. +2013-xx-xx - xxxxxxx - lavfi 3.4.0 - avfiltergraph.h + Add resample_lavr_opts to AVFilterGraph for setting libavresample options + for auto-inserted resample filters. + 2013-xx-xx - xxxxxxx - lavu 52.7.0 - dict.h Add av_dict_parse_string() to set multiple key/value pairs at once from a string. |