Merge commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Dec 2012 12:49:26 +0000 (13:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Dec 2012 12:49:26 +0000 (13:49 +0100)
* 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>
1  2 
configure
libavcodec/arm/fft_fixed_init_arm.c
libavcodec/dct-test.c
libavcodec/snowenc.c

diff --cc configure
Simple merge
Simple merge
Simple merge
@@@ -22,8 -22,8 +22,9 @@@
  #include "libavutil/log.h"
  #include "libavutil/opt.h"
  #include "avcodec.h"
 +#include "internal.h"
  #include "dsputil.h"
+ #include "internal.h"
  #include "dwt.h"
  #include "snow.h"