• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 55c49afc
    Michael Niedermayer authored
    * qatar/master:
      yuv4mpeg: return proper error codes.
      Give all anonymously typedeffed structs in headers a name
      fate: Add parseutils test
      parseutils-test: Drop random colors from parsing test
      vf_pad/scale: use double precision for aspect ratios.
      build: error on variable-length arrays
      ppc: swscale: rework yuv2planeX_altivec()
      ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec()
      x86: dsputil: kill VLA in gmc_mmx()
      libspeexenc: Updated commentary to reflect recent changes
      libspeexenc: Add an option for enabling DTX
      doc/APIchanges: fill in missing dates and hashes.
      lavr: bump major to 1 and declare it stable.
      lavr: change the type of the data buffers to uint8_t**.
      lavc: deprecate the audio resampling API.
    
    Conflicts:
    	cmdutils.h
    	configure
    	doc/APIchanges
    	ffplay.c
    	libavcodec/dwt.h
    	libavcodec/libspeexenc.c
    	libavfilter/vf_pad.c
    	libavfilter/vf_scale.c
    	libavformat/asf.h
    	tests/fate/libavutil.mak
    	tests/ref/fate/parseutils
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    55c49afc
vp56data.h 11.8 KB