Merge remote-tracking branch 'qatar/master'

* qatar/master: avutil: do not use avcodec header in frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-10 03:57:46 +01:00 · 2014-01-10 03:57:46 +01:00 · c47fc0339a
parent d9481dcd61 02b9fafcca
commit c47fc0339a
1 changed files with 1 additions and 2 deletions
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@ -22,13 +22,12 @@

 #include <stdint.h>

-#include "libavcodec/version.h"
-
 #include "avutil.h"
 #include "buffer.h"
 #include "dict.h"
 #include "rational.h"
 #include "samplefmt.h"
+#include "version.h"

 enum AVColorSpace{
    AVCOL_SPC_RGB         =  0,