diff options
| author | Michael Niedermayer <[email protected]> | 2014-08-03 19:35:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-08-03 19:35:08 +0200 |
| commit | 85aaa4e6d571e44749f80b8223c07d656bf8e035 (patch) | |
| tree | 4ab335f77e8c50ebd7cd0f9924cef190e3356e2b /libavresample/utils.c | |
| parent | f1d6fc779450715fda20e7844ffc6364e50f5a3e (diff) | |
| parent | 072916d903d3a925bcd0c864f12254157cab63c1 (diff) | |
Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'
* commit '072916d903d3a925bcd0c864f12254157cab63c1':
filtfmts: Replace deprecated uses of AVFilterPad
Conflicts:
libavfilter/filtfmts.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavresample/utils.c')
0 files changed, 0 insertions, 0 deletions