1. 11 Jan, 2012 1 commit
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 0e7fc3ca
      Michael Niedermayer authored
      * qatar/master: (22 commits)
        rv34: frame-level multi-threading
        mpegvideo: claim ownership of referenced pictures
        aacsbr: prevent out of bounds memcpy().
        ipmovie: fix pts for CODEC_ID_INTERPLAY_DPCM
        sierravmd: fix audio pts
        bethsoftvideo: Use bytestream2 functions to prevent buffer overreads.
        bmpenc: support for PIX_FMT_RGB444
        swscale: fix crash in fast_bilinear code when compiled with -mred-zone.
        swscale: specify register type.
        rv34: use get_bits_left()
        avconv: reinitialize the filtergraph on resolution change.
        vsrc_buffer: error on changing frame parameters.
        avconv: fix -copyinkf.
        fate: Update file checksums after the mov muxer change in a78dbada
        movenc: Don't store a nonzero creation time if nothing was set by the caller
        bmpdec: support for rgb444 with bitfields compression
        rgb2rgb: allow conversion for <15 bpp
        doc: fix stray reference to FFmpeg
        v4l2: use C99 struct initializer
        v4l2: poll the file descriptor
        ...
      
      Conflicts:
      	avconv.c
      	libavcodec/aacsbr.c
      	libavcodec/bethsoftvideo.c
      	libavcodec/kmvc.c
      	libavdevice/v4l2.c
      	libavfilter/vsrc_buffer.c
      	libswscale/swscale_unscaled.c
      	libswscale/x86/input.asm
      	tests/ref/acodec/alac
      	tests/ref/acodec/pcm_s16be
      	tests/ref/acodec/pcm_s24be
      	tests/ref/acodec/pcm_s32be
      	tests/ref/acodec/pcm_s8
      	tests/ref/lavf/mov
      	tests/ref/vsynth1/dnxhd_1080i
      	tests/ref/vsynth1/mpeg4
      	tests/ref/vsynth1/qtrle
      	tests/ref/vsynth1/svq1
      	tests/ref/vsynth2/dnxhd_1080i
      	tests/ref/vsynth2/mpeg4
      	tests/ref/vsynth2/qtrle
      	tests/ref/vsynth2/svq1
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      0e7fc3ca
  2. 10 Jan, 2012 39 commits