* qatar/master:
ffmpeg: get rid of the -vglobal option.
dct32: Add AVX implementation of 32-point DCT
dct32: Change pass 6 permutation to allow for AVX implementation
dct32: port SSE 32-point DCT to YASM
multiple inclusion guard cleanup
avio: document buffer must created with av_malloc() and friends
avio: check AVIOContext malloc failure
swscale: point out an alternative to sws_getContext
svq3: Do initialization after parsing the extradata
add changelog entries for 0.7_beta2
mp3lame: add #include required for AV_RB32 macro.
Conflicts:
Changelog
libavcodec/svq3.c
libavcodec/x86/dct32_sse.c
libavfilter/vsrc_buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
It is just a logical OR of several decoder definitions, all of which depend on
CONFIG_H263_DECODER. So it can just be replaced by the latter.
Originally committed as revision 20973 to svn://svn.ffmpeg.org/ffmpeg/trunk
CONFIG_ANY_H263_ENCODER is just a logical OR of H.263 family definitions,
for which the build system enables CONFIG_H263_ENCODER anyway.
Originally committed as revision 20950 to svn://svn.ffmpeg.org/ffmpeg/trunk
CONFIG_RV20_ENCODER when also checking for CONFIG_H263_ENCODER.
The RV10/RV20 encoders depend on the H.263 encoder.
Originally committed as revision 19593 to svn://svn.ffmpeg.org/ffmpeg/trunk
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.' to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".
Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
