diff options
| author | Michael Niedermayer <[email protected]> | 2013-05-31 11:32:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-05-31 11:32:58 +0200 |
| commit | f0b9bd807b15757587254153bdea7b3898985c9c (patch) | |
| tree | 4fed4cabae462f2bdc6d4f331faf109680a81b9e /libavfilter/af_join.c | |
| parent | 7de8a38160d86edccfbfb770a25301cde8d6d6e4 (diff) | |
| parent | 0b0953baecc5b0f8a85169c6bcc3db69a73f2205 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
proresenc: alpha coding support
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavfilter/af_join.c')
0 files changed, 0 insertions, 0 deletions