Merge remote-tracking branch 'qatar/master'
* qatar/master:
rv30: return AVERROR(EINVAL) instead of EINVAL
build: add -L flags before existing LDFLAGS
simple_idct: whitespace cosmetics
simple_idct: make repeated code a macro
dsputil: remove huge #if 0 block
simple_idct: change 10-bit add/put stride from pixels to bytes
dsputil: allow 9/10-bit functions for non-h264 codecs
dnxhd: rename some data tables
dnxhdenc: remove inline from function only called through pointer
dnxhdenc: whitespace cosmetics
swscale: mark YUV422P10(LE,BE) as supported for output
configure: add -xc99 to LDFLAGS for Sun CC
Remove unused and non-compiling vestigial g729 decoder
Remove unused code under G729_BITEXACT #ifdef.
mpegvideo: fix invalid picture unreferencing.
dsputil: Remove extra blank line at end.
dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT.
simple_idct: add 10-bit version
Conflicts:
Makefile
libavcodec/g729data.h
libavcodec/g729dec.c
libavcodec/rv30.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
Showing
- Makefile 0 additions, 2 deletionsMakefile
- common.mak 3 additions, 1 deletioncommon.mak
- configure 1 addition, 0 deletionsconfigure
- libavcodec/acelp_pitch_delay.c 0 additions, 11 deletionslibavcodec/acelp_pitch_delay.c
- libavcodec/acelp_vectors.c 0 additions, 20 deletionslibavcodec/acelp_vectors.c
- libavcodec/acelp_vectors.h 0 additions, 31 deletionslibavcodec/acelp_vectors.h
- libavcodec/alpha/dsputil_alpha.c 1 addition, 1 deletionlibavcodec/alpha/dsputil_alpha.c
- libavcodec/amrnbdec.c 1 addition, 1 deletionlibavcodec/amrnbdec.c
- libavcodec/arm/dsputil_init_arm.c 1 addition, 1 deletionlibavcodec/arm/dsputil_init_arm.c
- libavcodec/arm/dsputil_init_armv5te.c 3 additions, 2 deletionslibavcodec/arm/dsputil_init_armv5te.c
- libavcodec/arm/dsputil_init_armv6.c 3 additions, 2 deletionslibavcodec/arm/dsputil_init_armv6.c
- libavcodec/arm/dsputil_init_neon.c 1 addition, 1 deletionlibavcodec/arm/dsputil_init_neon.c
- libavcodec/bfin/dsputil_bfin.c 12 additions, 10 deletionslibavcodec/bfin/dsputil_bfin.c
- libavcodec/celp_math.c 0 additions, 85 deletionslibavcodec/celp_math.c
- libavcodec/dct-test.c 1 addition, 1 deletionlibavcodec/dct-test.c
- libavcodec/dnxhdenc.c 33 additions, 31 deletionslibavcodec/dnxhdenc.c
- libavcodec/dsputil.c 24 additions, 21 deletionslibavcodec/dsputil.c
- libavcodec/dsputil_template.c 0 additions, 145 deletionslibavcodec/dsputil_template.c
- libavcodec/g729data.h 0 additions, 278 deletionslibavcodec/g729data.h
- libavcodec/g729dec.c 0 additions, 331 deletionslibavcodec/g729dec.c
Loading
Please register or sign in to comment