• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · f93f6963
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f93f6963
celp_math.c 3.54 KB