Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 16:28:38 +0000 (18:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 16:30:37 +0000 (18:30 +0200)
* commit 'd23fc8846d255e31896453136b4c77bc6d5e873f':
  filtfmts: remove unused lavf include

A include for channel_layout.h, is added otherwise compile would break

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/filtfmts.c

@@@ -20,9 -20,7 +20,9 @@@
  
  #include <stdio.h>
  
- #include "libavformat/avformat.h"
++#include "libavutil/channel_layout.h"
  #include "libavutil/pixdesc.h"
 +#include "libavutil/samplefmt.h"
  #include "libavfilter/avfilter.h"
  #include "libavfilter/formats.h"