RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  avutil: do not use avcodec header in frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-10 03:57:46 +01:00
parent d9481dcd61 02b9fafcca
commit c47fc0339a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavutil/frame.h
View File

@ -22,13 +22,12 @@
#include <stdint.h> #include <stdint.h>
#include "libavcodec/version.h"
#include "avutil.h" #include "avutil.h"
#include "buffer.h" #include "buffer.h"
#include "dict.h" #include "dict.h"
#include "rational.h" #include "rational.h"
#include "samplefmt.h" #include "samplefmt.h"
#include "version.h"
enum AVColorSpace{ enum AVColorSpace{
AVCOL_SPC_RGB = 0, AVCOL_SPC_RGB = 0,