1. 22 Feb, 2012 4 commits
    • Nicolas George's avatar
      af_pan: remove dual double/int storage of gain. · 4217dfe8
      Nicolas George authored
      libswresample takes care of that now.
      4217dfe8
    • Paul B Mahol's avatar
      d00bc6a8
    • Michael Niedermayer's avatar
      8a08503b
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 184fc600
      Michael Niedermayer authored
      * qatar/master:
        mpegvideo_enc: only allocate output packet when we know there will be output
        Add names for more channel layouts to the channel layout map.
        sunrast: Add a sample request for RMP_RAW colormap.
        avcodec: do not override pts or duration from the audio encoder
        Add prores regression test.
        Enable already existing rso regression test.
        Add regression test for "sox" format muxer/demuxer.
        Add dpx encoding regression test.
        swscale: K&R formatting cosmetics for PowerPC code (part I/II)
        img2: Use ff_guess_image2_codec(filename) shorthand where appropriate.
        Clarify licensing information about files borrowed from libjpeg.
        Mark mutable static data const where appropriate.
        avplay: fix -threads option
        dvbsubdec: avoid undefined signed left shift in RGBA macro
        mlpdec: use av_log_ask_for_sample()
        gif: K&R formatting cosmetics
        png: make .long_name more descriptive
        movdec: Adjust keyframe flagging in fragmented files
        rv34: change most "int stride" into "ptrdiff_t stride".
      
      Conflicts:
      	avprobe.c
      	ffplay.c
      	libavcodec/mlpdec.c
      	libavcodec/mpegvideo_enc.c
      	libavcodec/pngenc.c
      	libavcodec/x86/v210-init.c
      	libavfilter/vf_boxblur.c
      	libavfilter/vf_crop.c
      	libavfilter/vf_drawtext.c
      	libavfilter/vf_lut.c
      	libavfilter/vf_overlay.c
      	libavfilter/vf_pad.c
      	libavfilter/vf_scale.c
      	libavfilter/vf_select.c
      	libavfilter/vf_setpts.c
      	libavfilter/vf_settb.c
      	libavformat/img2.c
      	libavutil/audioconvert.c
      	tests/codec-regression.sh
      	tests/lavf-regression.sh
      	tests/ref/lavf/dpx
      	tests/ref/vsynth1/prores
      	tests/ref/vsynth2/prores
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      184fc600
  2. 21 Feb, 2012 25 commits
  3. 20 Feb, 2012 11 commits