You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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>
|
13 years ago |
| .. |
|
Makefile
|
Add gradfun filter, ported from MPlayer.
|
15 years ago |
|
gradfun.c
|
Merge remote-tracking branch 'qatar/master'
|
13 years ago |
|
yadif.c
|
Merge remote-tracking branch 'qatar/master'
|
13 years ago |
|
yadif_template.c
|
Merge remote-tracking branch 'qatar/master'
|
13 years ago |