diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 10:28:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 10:28:47 +0100 |
| commit | 078dab551d53fa979f8110dc8a63deae78036a5a (patch) | |
| tree | 1eb36dfb3a5ada3a842c60f13ef2b5d958610137 /libavfilter/af_amerge.c | |
| parent | 893063781926aa23a28226384a8c46eea4e1524a (diff) | |
| parent | 529a9893d769f381b72785c500662be2020da5fe (diff) | |
| download | ffmpeg-078dab551d53fa979f8110dc8a63deae78036a5a.tar.gz | |
Merge commit '529a9893d769f381b72785c500662be2020da5fe'
* commit '529a9893d769f381b72785c500662be2020da5fe':
avframe: mark source frame const in _ref and _clone
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amerge.c')
0 files changed, 0 insertions, 0 deletions