diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-20 19:03:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-20 19:14:11 +0200 |
| commit | 6b783d2acea049d3ebbfe1352b55c8efe8b5168c (patch) | |
| tree | bfa6b3922e5969c976dcbb096ca6845df8136650 /ffmpeg.h | |
| parent | fa7dec8cb00d2d0dd96ff9863ccda38428610a21 (diff) | |
| parent | 7046bd9bc9ce04521edf453c9b603d84d69c7512 (diff) | |
| download | ffmpeg-6b783d2acea049d3ebbfe1352b55c8efe8b5168c.tar.gz | |
Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512'
* commit '7046bd9bc9ce04521edf453c9b603d84d69c7512':
lavfi: Move avcodec header to the only filter needing it
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.h')
0 files changed, 0 insertions, 0 deletions