diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 16:49:26 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 16:49:26 +0400 |
| commit | 7181806dc18062c5d1da760dcfdfbb99893b91cd (patch) | |
| tree | cb3c42d82e410eae7c1d19cc0f28d6e2ab5bfca8 /libavcodec/snowenc.c | |
| parent | 8ee14aa5c7a283b09dbd3e82e21208c1aa1ab938 (diff) | |
| parent | 9ebd45c2d58ad9241ad09718679f0cf7fb57da52 (diff) | |
Merge commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52'
* commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52':
configure: do not bypass cpuflags section if --cpu not given
dct-test: arm: indicate required cpu features for optimised funcs
snow: fix build after 594d4d5df3c70404168701dd5c90b7e6e5587793
arm: fix use of uninitialised value in ff_fft_fixed_init_arm()
avpicture: Don't assume a valid pix fmt in avpicture_get_size
Conflicts:
libavcodec/avpicture.c
libavcodec/snow.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/snowenc.c')
| -rw-r--r-- | libavcodec/snowenc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 701a56d284..02c3aaab38 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -24,6 +24,7 @@ #include "avcodec.h" #include "internal.h" #include "dsputil.h" +#include "internal.h" #include "dwt.h" #include "snow.h" |