1. 08 Jun, 2011 3 commits
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · d552f616
      Michael Niedermayer authored
      * qatar/master: (28 commits)
        Remove some non-compiling debug messages.
        ffplay: Fix non-compiling debug printf and replace it by av_dlog.
        H264: x86 predict init cosmetics.
        ac3enc: Fix linking of AC-3 encoder without the E-AC-3 encoder.
        Move E-AC-3 encoder functions to a separate eac3enc.c file.
        ac3enc: remove convenience macro, #define DEBUG
        ac3enc: remove unused #define
        vc1: re-initialize tables after width/height change.
        APIchanges: fill-in git commit hash for av_get_bytes_per_sample() addition
        samplefmt: add av_get_bytes_per_sample()
        iirfilter: fix biquad filter coefficients.
        swscale: remove duplicate conversion routine in swScale().
        swscale: add yuv2planar/packed function typedefs.
        swscale: integrate yuv2nv12X_C into yuv2yuvX() function pointers.
        swscale: reindent x86 init code.
        swscale: extract SWS_FULL_CHR_H_INT conditional into init code.
        swscale: cosmetics.
        swscale: remove alp/chr/lumSrcOffset.
        swscale: un-special-case yuv2yuvX16_c().
        shorten: Remove stray DEBUG #define and corresponding av_dlog statement.
        ...
      
      Conflicts:
      	doc/APIchanges
      	libavcodec/ac3enc.c
      	libavutil/avutil.h
      	libavutil/samplefmt.c
      	libswscale/swscale.c
      	libswscale/swscale_internal.h
      	libswscale/x86/swscale_template.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      d552f616
    • Etienne Buira's avatar
      crypto: fix potential double free · 7d89f7cb
      Etienne Buira authored
      7d89f7cb
    • Etienne Buira's avatar
      libx264: fix double free · 1e9b3026
      Etienne Buira authored
      1e9b3026
  2. 07 Jun, 2011 37 commits