History

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 libavfilter/avfiltergraph.h (1 of 5 files). Show all

Unified · Split

libavfilter/avfiltergraph.h+1−0
@@ -45,6 +45,7 @@ typedef struct AVFilterGraph { · 44 unmodified lines
45 int sink_links_count;45 int sink_links_count;
46 46
47 unsigned disable_auto_convert;47 unsigned disable_auto_convert;
48 char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters
48} AVFilterGraph;49} AVFilterGraph;
49 50
50/**51/**

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t