1. 21 Jun, 2011 4 commits
    • Michael Niedermayer's avatar
      avfilter picture pool: double free hotfix · 90c6963d
      Michael Niedermayer authored
      This fix introduces a small memleak
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      90c6963d
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 6cbe8199
      Michael Niedermayer authored
      * qatar/master: (28 commits)
        Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
        x86: cabac: fix register constraints for 32-bit mode
        cabac: move x86 asm to libavcodec/x86/cabac.h
        x86: h264: cast pointers to intptr_t rather than int
        x86: h264: remove hardcoded edi in decode_significance_8x8_x86()
        x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()
        x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()
        x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()
        x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()
        x86: cabac: remove hardcoded esi in get_cabac_inline()
        x86: cabac: remove hardcoded edx in get_cabac_inline()
        x86: cabac: remove unused macro parameter
        x86: cabac: remove hardcoded ebx in inline asm
        x86: cabac: remove hardcoded struct offsets from inline asm
        cabac: remove inline asm under #if 0
        cabac: remove BRANCHLESS_CABAC_DECODER switch
        cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED
        document libswscale bump
        error_resilience: skip last-MV predictor step if MVs are not available.
        error_resilience: actually add counter when adding a MV predictor.
        ...
      
      Conflicts:
      	Changelog
      	libavcodec/error_resilience.c
      	libavfilter/defaults.c
      	libavfilter/vf_drawtext.c
      	libswscale/swscale.h
      	tests/ref/vsynth1/error
      	tests/ref/vsynth2/error
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      6cbe8199
    • Michael Niedermayer's avatar
    • Kim Nguyen's avatar
      ppc32: Fix movrel · 2d16394f
      Kim Nguyen authored
      Fixes ticket272
      2d16394f
  2. 20 Jun, 2011 32 commits
  3. 19 Jun, 2011 4 commits