1. 28 Jan, 2012 5 commits
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · e37f161e
      Michael Niedermayer authored
      * qatar/master: (71 commits)
        movenc: Allow writing to a non-seekable output if using empty moov
        movenc: Support adding isml (smooth streaming live) metadata
        libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
        sunrast: Document the different Sun Raster file format types.
        sunrast: Add a check for experimental type.
        libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
        lavf: remove disabled FF_API_SET_PTS_INFO cruft
        lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
        lavf: remove disabled FF_API_REORDER_PRIVATE cruft
        lavf: remove disabled FF_API_SEEK_PUBLIC cruft
        lavf: remove disabled FF_API_STREAM_COPY cruft
        lavf: remove disabled FF_API_PRELOAD cruft
        lavf: remove disabled FF_API_NEW_STREAM cruft
        lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
        lavf: remove disabled FF_API_MUXRATE cruft
        lavf: remove disabled FF_API_FILESIZE cruft
        lavf: remove disabled FF_API_TIMESTAMP cruft
        lavf: remove disabled FF_API_LOOP_OUTPUT cruft
        lavf: remove disabled FF_API_LOOP_INPUT cruft
        lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
        ...
      
      Conflicts:
      	doc/APIchanges
      	libavcodec/8bps.c
      	libavcodec/avcodec.h
      	libavcodec/libx264.c
      	libavcodec/mjpegbdec.c
      	libavcodec/options.c
      	libavcodec/sunrast.c
      	libavcodec/utils.c
      	libavcodec/version.h
      	libavcodec/x86/h264_deblock.asm
      	libavdevice/libdc1394.c
      	libavdevice/v4l2.c
      	libavformat/avformat.h
      	libavformat/avio.c
      	libavformat/avio.h
      	libavformat/aviobuf.c
      	libavformat/dv.c
      	libavformat/mov.c
      	libavformat/utils.c
      	libavformat/version.h
      	libavformat/wtv.c
      	libavutil/Makefile
      	libavutil/file.c
      	libswscale/x86/input.asm
      	libswscale/x86/swscale_mmx.c
      	libswscale/x86/swscale_template.c
      	tests/ref/lavf/ffm
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      e37f161e
    • Michael Niedermayer's avatar
      mpegvideoenc: Fail if a buffer size is specified without a max rate. · f21b6159
      Michael Niedermayer authored
      This combination makes not much sense.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      f21b6159
    • Michael Niedermayer's avatar
      pngdec: Convert 2/4 bit formats to 8bit. · 49f20562
      Michael Niedermayer authored
      This way 2 and 4 bit gray, rgb & rgba are supported.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      49f20562
    • Michael Niedermayer's avatar
      eb3f81e4
    • Paul B Mahol's avatar
      sws/pixfmt/pixdesc: add support for yuva444p · f9ca1ac7
      Paul B Mahol authored
      Signed-off-by: 's avatarRonald S. Bultje <rsbultje@gmail.com>
      
      Conflicts:
      
      	libavutil/avutil.h
      	libavutil/pixfmt.h
      f9ca1ac7
  2. 27 Jan, 2012 35 commits