diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 20:25:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 20:26:07 +0200 |
| commit | 8044ab94e485d2c40ff8d87a7907f31ed2ebc997 (patch) | |
| tree | cfde6406281937804eb0361be8bc43a1dbb8e8e6 | |
| parent | 257188acea8d93218d5bbfc65593567f1f34b4c2 (diff) | |
| parent | 452e343295e25f7b2cbc8529c66e9386e2ea6f55 (diff) | |
| download | ffmpeg-8044ab94e485d2c40ff8d87a7907f31ed2ebc997.tar.gz | |
Merge commit '452e343295e25f7b2cbc8529c66e9386e2ea6f55' into release/0.10
* commit '452e343295e25f7b2cbc8529c66e9386e2ea6f55':
avcodec: Add more missing #includes for ff_get_buffer()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libgsm.c | 1 | ||||
| -rw-r--r-- | libavcodec/libopencore-amr.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/libgsm.c b/libavcodec/libgsm.c index cb85f02a18..52d8b93749 100644 --- a/libavcodec/libgsm.c +++ b/libavcodec/libgsm.c @@ -30,6 +30,7 @@ #include <gsm/gsm.h> #include "avcodec.h" +#include "internal.h" #include "gsm.h" static av_cold int libgsm_encode_init(AVCodecContext *avctx) { diff --git a/libavcodec/libopencore-amr.c b/libavcodec/libopencore-amr.c index 1e567f4278..27a399d796 100644 --- a/libavcodec/libopencore-amr.c +++ b/libavcodec/libopencore-amr.c @@ -20,6 +20,7 @@ */ #include "avcodec.h" +#include "internal.h" #include "libavutil/avstring.h" #include "libavutil/opt.h" |