virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

Merge commit '7046bd9bc9ce04521edf453c9b603d84d69c7512'

Browse Source 
* commit '7046bd9bc9ce04521edf453c9b603d84d69c7512':
  lavfi: Move avcodec header to the only filter needing it

Conflicts:
	libavfilter/avfilter.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-20 19:03:51 +02:00
parent fa7dec8cb0 7046bd9bc9
commit 6b783d2ace
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/af_ashowinfo.c
View File

@@ -37,6 +37,8 @@
#include "libavutil/timestamp.h"
#include "libavutil/samplefmt.h"
#include "libavcodec/avcodec.h"
#include "audio.h"
#include "avfilter.h"
#include "internal.h"