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

Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da' 

* commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da':
  avcodec.h: include version.h before using version macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-19 18:18:47 +01:00
parent 6a71efff33 6f1ec8edf2
commit 066dbfe165
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/avcodec.h
View File

@ -37,15 +37,16 @@
#include "libavutil/dict.h"
#include "libavutil/frame.h"
#include "libavutil/log.h"
#if FF_API_FAST_MALLOC
// to provide fast_*alloc
#include "libavutil/mem.h"
#endif
#include "libavutil/pixfmt.h"
#include "libavutil/rational.h"
#include "version.h"
#if FF_API_FAST_MALLOC
// to provide fast_*alloc
#include "libavutil/mem.h"
#endif
/**
* @defgroup libavc Encoding/Decoding Library
* @{