« Previous | Next » 

Revision 59eb12fa

ID59eb12faff9505da49f54d499dd43404226e37f6
Parent 580fa76c, b6675279
Child b9660e2a

Added by Michael Niedermayer about 9 years ago

Merge remote branch 'qatar/master'

  • qatar/master: (30 commits)
    AVOptions: make default_val a union, as proposed in AVOption2.
    arm/h264pred: add missing argument type.
    h264dsp_mmx: place bracket outside #if/#endif block.
    lavf/utils: fix ff_interleave_compare_dts corner case.
    fate: add 10-bit H264 tests.
    h264: do not print "too many references" warning for intra-only.
    Enable decoding of high bit depth h264.
    Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.
    Add support for higher QP values in h264.
    Add the notion of pixel size in h264 related functions.
    Make the h264 loop filter bit depth aware.
    Template dsputil_template.c with respect to pixel size, etc.
    Template h264idct_template.c with respect to pixel size, etc.
    Preparatory patch for high bit depth h264 decoding support.
    Move some functions in dsputil.c into a new file dsputil_template.c.
    Move the functions in h264idct into a new file h264idct_template.c.
    Move the functions in h264pred.c into a new file h264pred_template.c.
    Preparatory patch for high bit depth h264 decoding support.
    Add pixel formats for 9- and 10-bit yuv420p.
    Choose h264 chroma dc dequant function dynamically.
    ...

Conflicts:
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/alpha/dsputil_alpha.c
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_iwmmxt.c
libavcodec/arm/h264pred_init_arm.c
libavcodec/bfin/dsputil_bfin.c
libavcodec/dsputil.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/h264dsp.c
libavcodec/h264idct.c
libavcodec/h264pred.c
libavcodec/mlib/dsputil_mlib.c
libavcodec/options.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/h264_altivec.c
libavcodec/ps2/dsputil_mmi.c
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/dsputil_sh4.c
libavcodec/sparc/dsputil_vis.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/x86/dsputil_mmx.c
libavformat/options.c
libavformat/utils.c
libavutil/pixfmt.h
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_template.c
tests/ref/seek/lavf_avi

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted