Michael Niedermayer
7427d1ca4a
Merge remote-tracking branch 'qatar/master'
* qatar/master:
g723.1: simplify scale_vector()
g723.1: simplify normalize_bits()
vda: cosmetics: fix Doxygen comment formatting
vda: better frame allocation
vda: Merge implementation into one file
vda: support synchronous decoding
vda: Reuse the bitstream buffer and reallocate it only if needed
build: Factor out mpegvideo encoding dependencies to CONFIG_MPEGVIDEOENC
avprobe: Include libm.h for the log2 fallback
proresenc: use the edge emulation buffer
rtmp: handle bytes read reports
configure: Fix typo in mpeg2video/svq1 decoder dependency declaration
Use log2(x) instead of log(x) / log(2)
x86: swscale: fix fragile memory accesses
x86: swscale: remove disabled code
x86: yadif: fix asm with suncc
x86: cabac: allow building with suncc
x86: mlpdsp: avoid taking address of void
ARM: intmath: use native-size return types for clipping functions
Conflicts:
configure
ffprobe.c
libavcodec/Makefile
libavcodec/g723_1.c
libavcodec/v210dec.h
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/x86/cabac.h
libavfilter/x86/yadif_template.c
libswscale/x86/rgb2rgb_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-14 15:34:39 +02:00
..
2012-06-20 20:47:46 +02:00
2012-07-23 21:25:09 +02:00
2012-07-23 21:25:09 +02:00
2012-08-14 15:34:39 +02:00
2012-07-19 00:17:16 +00:00
2012-07-19 15:49:21 +00:00
2010-01-16 04:48:55 +00:00
2012-07-04 21:03:28 +02:00
2012-07-07 01:41:55 +00:00
2012-07-23 21:25:09 +02:00
2012-02-23 04:31:55 +01:00
2012-07-23 21:25:09 +02:00
2012-07-19 00:17:16 +00:00
2012-07-04 23:47:01 +02:00
2012-08-12 23:23:19 +02:00
2012-01-14 02:22:09 +01:00
2012-08-04 23:51:43 +02:00
2012-08-04 23:51:43 +02:00
2012-08-09 19:31:56 +02:00
2012-08-04 23:51:43 +02:00
2012-07-17 14:25:49 +02:00