diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:06:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 00:06:42 +0100 |
| commit | 7fce8c752d87ca4738179bb7e9238bae67abdeac (patch) | |
| tree | cf884999bbf61ac8a23cc37843915e49e51a42d7 /libavfilter/graphparser.c | |
| parent | 5c17377e28e818d3074a608d42821d66f1d26e8d (diff) | |
| parent | 71f1ad37d858b810b71a4af1c25771beaa50b27b (diff) | |
| download | ffmpeg-7fce8c752d87ca4738179bb7e9238bae67abdeac.tar.gz | |
Merge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'
* commit '71f1ad37d858b810b71a4af1c25771beaa50b27b':
lavc: do not compile fmtconvert unconditionally
Conflicts:
configure
libavcodec/ppc/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/graphparser.c')
0 files changed, 0 insertions, 0 deletions