1. 07 Sep, 2011 8 commits
  2. 06 Sep, 2011 28 commits
  3. 05 Sep, 2011 4 commits
    • Michael Niedermayer's avatar
    • Michael Niedermayer's avatar
      vf_drawtext: always use expanded_text as we always support strftime() now and... · 845383c3
      Michael Niedermayer authored
      vf_drawtext: always use expanded_text as we always support strftime() now and dont depend on localtime_r() anymore
      
      Found-by: Rolf Siegrist
      Signed-off-by: default avatarMichael Niedermayer <michaelni@gmx.at>
      845383c3
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 3c54e7ed
      Michael Niedermayer authored
      * qatar/master:
        ac3enc: Add channel coupling support for the fixed-point AC-3 encoder.
        ac3enc: scale floating-point coupling channel coefficients in scale_coefficients() rather than in apply_channel_coupling()
        ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.
        wavpack: fix wrong return value in wavpack_decode_block()
        avconv: fix parsing metadata specifiers.
        fate: use +frame+slice named constants instead of '3'
        mpeg12: propagate more real return values through chunk decode error return and fix some indentation
        wavpack: use context reset in appropriate places
        avconv: move mux_preload and mux_max_delay to options context
        avconv: move bitstream filters to options context.
        avconv: move rate_emu to options context.
        avconv: move max_frames to options context.
        avconv: move metadata to options context.
        avconv: move ts scale to options context.
        avconv: move chapter maps to options context.
        avconv: move metadata maps to options context.
        avconv: move codec_names to options context.
      
      Conflicts:
      	avconv.c
      	tests/fate-run.sh
      Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
      3c54e7ed
    • Michael Niedermayer's avatar
      swscale: Fix unused asm and enable it · 27bf5993
      Michael Niedermayer authored
      Author of the fix is ronald, the enabling & commit message are mine.
      
      This fixes
      	commit 4e3e333a
      	Author: Ronald S. Bultje <rsbultje@gmail.com>
      	Date:   Tue Jul 5 12:49:11 2011 -0700
      
      	    swscale: error dithering for 16/9/10-bit to 8-bit.
      
      	    Based on a somewhat similar idea in FFmpeg's swscale copy.
      
      The Fix was originally commited in: (and i missed it due to the commit message)
      	commit 5c391a16
      	Author: Ronald S. Bultje <rsbultje@gmail.com>
      	Date:   Fri Jul 8 14:39:04 2011 -0700
      
      	    swscale: rename uv_off/uv_off2 to uv_off_px/byte.
      27bf5993