diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 21:46:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 21:46:42 +0200 |
| commit | 4a63c69faac6fca4eea6fc4e8466ebdc8c4575c5 (patch) | |
| tree | 93e2a4a8b3f3af332e04fd09157e394832f210b7 /libavfilter/vf_pullup.c | |
| parent | 2ece7d94bc35ba0ee2b650caec25853b9fcc2eb7 (diff) | |
| parent | 79cbac8cd456c3f1c914bd1e7262b55e48de13a7 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
atrac3: Generalize gain compensation code
Conflicts:
libavcodec/atrac.c
libavcodec/atrac.h
libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_pullup.c')
0 files changed, 0 insertions, 0 deletions