diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 11:41:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 11:46:51 +0100 |
| commit | 85b7b0c519f8d9491b4c0340329a605cc97c8984 (patch) | |
| tree | 7990305137bc5ece3e78f58218e67982853383ea /libavfilter/af_join.c | |
| parent | 92cbd775687204f9750a09c69f97702719036aab (diff) | |
| parent | 0ea430c75b8d90449d2878ad84669a2da2ad3cbc (diff) | |
| download | ffmpeg-85b7b0c519f8d9491b4c0340329a605cc97c8984.tar.gz | |
Merge commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc'
* commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc':
lclenc: use the AVFrame API properly.
Conflicts:
libavcodec/lclenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_join.c')
0 files changed, 0 insertions, 0 deletions