1. 12 May, 2011 4 commits
    • Michael Niedermayer's avatar
      Merge remote branch 'qatar/master' · 612122b1
      Michael Niedermayer authored
      * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
      612122b1
    • Michael Niedermayer's avatar
      libavformat/utils: Only consider dvb teletext timestamps for start time when... · 4ea216e7
      Michael Niedermayer authored
      libavformat/utils: Only consider dvb teletext timestamps for start time when they are consistent with the rest.
      
      This fixes Ticket51.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      4ea216e7
    • Michael Niedermayer's avatar
      error concealment: check last pictures motion_val before using it. · b8a4b015
      Michael Niedermayer authored
      Fixes NULL pointer dereference.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      b8a4b015
    • Michael Niedermayer's avatar
      sws-PPC: fix after VOFW change. · 1cafc232
      Michael Niedermayer authored
      It seems sws-PPC did hardcode 2048 at various places instead of using VOFW.
      This also means that all past VOFW benchmarks on PPC are meaningless
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      1cafc232
  2. 11 May, 2011 36 commits