1. 08 Mar, 2012 3 commits
    • Nicolas George's avatar
      vf_pad: keep a reference to the output buffer. · b50767c3
      Nicolas George authored
      Once fixed, the end_frame function does exactly what
      avfilter_default_end_frame does; therefore, end_frame
      can be removed to let avfilter_default_end_frame work.
      
      Fixes ticket #1038.
      b50767c3
    • Stefano Sabatini's avatar
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · bf807a5e
      Michael Niedermayer authored
      * qatar/master: (29 commits)
        sbrdsp.asm: convert all instructions to float/SSE ones.
        dv: cosmetics.
        dv: check buffer size before reading profile.
        Revert "AAC SBR: group some writes."
        udp: Print an error message if bind fails
        cook: extend channel uncoupling tables so the full bit range is covered.
        roqvideo: cosmetics.
        roqvideo: convert to bytestream2 API.
        dca: don't use av_clip_uintp2().
        wmall: fix build with -DDEBUG enabled.
        smc: port to bytestream2 API.
        AAC SBR: group some writes.
        dsputil: remove shift parameter from scalarproduct_int16
        SBR DSP: unroll sum_square
        rv34: remove dead code in intra availability check
        rv34: clean a bit availability checks.
        v4l2: update documentation
        tgq: convert to bytestream2 API.
        parser: remove forward declaration of MpegEncContext
        dca: prevent accessing static arrays with invalid indexes.
        ...
      
      Conflicts:
      	doc/indevs.texi
      	libavcodec/Makefile
      	libavcodec/dca.c
      	libavcodec/dvdata.c
      	libavcodec/eatgq.c
      	libavcodec/mmvideo.c
      	libavcodec/roqvideodec.c
      	libavcodec/smc.c
      	libswscale/output.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      bf807a5e
  2. 07 Mar, 2012 37 commits