diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 03:02:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 03:02:09 +0100 |
| commit | 4155f2d7cc6a6413bbc6c40741e4d07e6612cac5 (patch) | |
| tree | 694baab0981bed509075db1519ce43adc11cdb68 /libavfilter/vf_pp7.c | |
| parent | 6ad749b5335444e5ca2223997d2ab2a215363327 (diff) | |
| parent | 3ea97767e49c599813d6a09c640a657d71c1a0de (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Add an ARES atom to extradata when encoding avui.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_pp7.c')
0 files changed, 0 insertions, 0 deletions