« Previous | Next » 

Revision 612122b1

ID612122b187d711257eecd517e4049cef3bb0b7f0
Parent 4ea216e7, 5705b020
Child b7903ab1

Added by Michael Niedermayer about 9 years ago

Merge remote branch 'qatar/master'

  • qatar/master: (32 commits)
    10-bit H.264 x86 chroma v loopfilter asm
    Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected]
    Fix crash of interlaced MPEG2 decoding
    h264pred: fix one more aliasing violation.
    doc/APIchanges: fill in missing hashes and dates.
    flacenc: use proper initializers for AVOption default values.
    lavc: deprecate named constants for deprecated antialias_algo.
    aac: workaround for compilation on cygwin
    swscale: extend YUV422p support to 10bits depth
    tiff: add support for inverted FillOrder for uncompressed data
    Remove unused softfloat implementation.
    h264pred: fix aliasing violations.
    rotozoom: Eliminate French variable name.
    rotozoom: Check return value of fread().
    rotozoom: Return an error value instead of calling exit().
    rotozoom: Make init_demo() return int and check for errors on invocation.
    rotozoom: Drop silly UINT8 typedef.
    rotozoom: Drop some unnecessary parentheses.
    rotozoom: K&R coding style cosmetics
    rtsp: Only do keepalive using GET_PARAMETER if the server supports it
    ...

Conflicts:
Changelog
cmdutils.c
doc/APIchanges
doc/general.texi
ffmpeg.c
ffplay.c
libavcodec/h264pred_template.c
libavcodec/resample.c
libavutil/pixfmt.h
libavutil/softfloat.c
libavutil/softfloat.h
tests/rotozoom.c

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted