git.sesse.net Git - ffmpeg/commit

Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>

author	Michael Niedermayer <michaelni@gmx.at>
	Sat, 28 Jan 2012 03:23:26 +0000 (04:23 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sat, 28 Jan 2012 06:53:34 +0000 (07:53 +0100)
commit	e37f161e66e042d6c2c7470c4d9881df9427fc4a
tree	6400fd6453f0525a65724937532d5baa33deead3	tree \| snapshot
parent	f21b6159cf3110a5f018d6addf7382840d427199	commit \| diff
parent	e771e6dd63e837220aa5d959486546d2be972e83	commit \| diff

cmdutils.c	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
doc/APIchanges	diff1 \|	diff2 \|	blob \| history
ffmpeg.c	diff1 \|	diff2 \|	blob \| history
ffplay.c	diff1 \|	diff2 \|	blob \| history
libavcodec/8bps.c	diff1 \|	diff2 \|	blob \| history
libavcodec/Makefile	diff1 \|	diff2 \|	blob \| history
libavcodec/ac3dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/audioconvert.c	diff1 \|	diff2 \|	blob \| history
libavcodec/audioconvert.h	diff1 \|	diff2 \|	blob \| history
libavcodec/avcodec.h	diff1 \|	diff2 \|	blob \| history
libavcodec/flacenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/frwu.c	diff1 \|	diff2 \|	blob \| history
libavcodec/g723_1.c	diff1 \|	\|	blob \| history
libavcodec/h264.c	diff1 \|	diff2 \|	blob \| history
libavcodec/imgconvert.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libaacplus.c	diff1 \|	\|	blob \| history
libavcodec/libmp3lame.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libspeexenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libx264.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libxavs.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegbdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mjpegdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg12enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpeg4videodec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegaudiodec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegaudiodec_float.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegvideo_enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/options.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sunrast.c	diff1 \|	diff2 \|	blob \| history
libavcodec/tiffenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/utils.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/version.h	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/ac3dsp.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dct32_sse.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/diracdsp_yasm.asm	diff1 \|	\|	blob \| history
libavcodec/x86/dsputil_yasm.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/dsputilenc_yasm.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/fft_mmx.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/fmtconvert.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264_chromamc.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264_deblock.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264_deblock_10bit.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264_idct.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264_idct_10bit.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264_intrapred.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264_intrapred_10bit.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/h264_weight.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/imdct36_sse.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/proresdsp.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/vp3dsp.asm	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/vp56dsp.asm	diff1 \|	diff2 \|	blob \| history
libavdevice/alsa-audio-dec.c	diff1 \|	diff2 \|	blob \| history
libavdevice/bktr.c	diff1 \|	diff2 \|	blob \| history
libavdevice/dshow.c	diff1 \|	\|	blob \| history
libavdevice/dv1394.c	diff1 \|	diff2 \|	blob \| history
libavdevice/fbdev.c	diff1 \|	diff2 \|	blob \| history
libavdevice/jack_audio.c	diff1 \|	diff2 \|	blob \| history
libavdevice/lavfi.c	diff1 \|	\|	blob \| history
libavdevice/libcdio.c	diff1 \|	diff2 \|	blob \| history
libavdevice/libdc1394.c	diff1 \|	diff2 \|	blob \| history
libavdevice/openal-dec.c	diff1 \|	\|	blob \| history
libavdevice/oss_audio.c	diff1 \|	diff2 \|	blob \| history
libavdevice/pulse.c	diff1 \|	diff2 \|	blob \| history
libavdevice/sndio_dec.c	diff1 \|	diff2 \|	blob \| history
libavdevice/v4l2.c	diff1 \|	diff2 \|	blob \| history
libavdevice/vfwcap.c	diff1 \|	diff2 \|	blob \| history
libavdevice/x11grab.c	diff1 \|	diff2 \|	blob \| history
libavfilter/libmpcodecs/mp_image.h	diff1 \|	\|	blob \| history
libavformat/4xm.c	diff1 \|	diff2 \|	blob \| history
libavformat/aacdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/act.c	diff1 \|	\|	blob \| history
libavformat/aea.c	diff1 \|	diff2 \|	blob \| history
libavformat/aiffdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/amr.c	diff1 \|	diff2 \|	blob \| history
libavformat/anm.c	diff1 \|	diff2 \|	blob \| history
libavformat/apc.c	diff1 \|	diff2 \|	blob \| history
libavformat/ape.c	diff1 \|	diff2 \|	blob \| history
libavformat/applehttp.c	diff1 \|	diff2 \|	blob \| history
libavformat/asfdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/assdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/au.c	diff1 \|	diff2 \|	blob \| history
libavformat/avformat.h	diff1 \|	diff2 \|	blob \| history
libavformat/avidec.c	diff1 \|	diff2 \|	blob \| history
libavformat/avio.c	diff1 \|	diff2 \|	blob \| history
libavformat/avio.h	diff1 \|	diff2 \|	blob \| history
libavformat/aviobuf.c	diff1 \|	diff2 \|	blob \| history
libavformat/avisynth.c	diff1 \|	diff2 \|	blob \| history
libavformat/avs.c	diff1 \|	diff2 \|	blob \| history
libavformat/bethsoftvid.c	diff1 \|	diff2 \|	blob \| history
libavformat/bfi.c	diff1 \|	diff2 \|	blob \| history
libavformat/bink.c	diff1 \|	diff2 \|	blob \| history
libavformat/bintext.c	diff1 \|	\|	blob \| history
libavformat/bit.c	diff1 \|	\|	blob \| history
libavformat/c93.c	diff1 \|	diff2 \|	blob \| history
libavformat/cafdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/cdg.c	diff1 \|	diff2 \|	blob \| history
libavformat/daud.c	diff1 \|	diff2 \|	blob \| history
libavformat/dfa.c	diff1 \|	diff2 \|	blob \| history
libavformat/dsicin.c	diff1 \|	diff2 \|	blob \| history
libavformat/dv.c	diff1 \|	diff2 \|	blob \| history
libavformat/dvenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/dxa.c	diff1 \|	diff2 \|	blob \| history
libavformat/eacdata.c	diff1 \|	diff2 \|	blob \| history
libavformat/electronicarts.c	diff1 \|	diff2 \|	blob \| history
libavformat/ffmdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/ffmenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/ffmetadec.c	diff1 \|	diff2 \|	blob \| history
libavformat/filmstripdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/flacdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/flic.c	diff1 \|	diff2 \|	blob \| history
libavformat/flvdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/g723_1.c	diff1 \|	\|	blob \| history
libavformat/g729dec.c	diff1 \|	\|	blob \| history
libavformat/gif.c	diff1 \|	diff2 \|	blob \| history
libavformat/gxf.c	diff1 \|	diff2 \|	blob \| history
libavformat/gxfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/icodec.c	diff1 \|	\|	blob \| history
libavformat/idcin.c	diff1 \|	diff2 \|	blob \| history
libavformat/idroqdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/iff.c	diff1 \|	diff2 \|	blob \| history
libavformat/img2.c	diff1 \|	diff2 \|	blob \| history
libavformat/ipmovie.c	diff1 \|	diff2 \|	blob \| history
libavformat/iss.c	diff1 \|	diff2 \|	blob \| history
libavformat/iv8.c	diff1 \|	diff2 \|	blob \| history
libavformat/ivfdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/jvdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/libmodplug.c	diff1 \|	\|	blob \| history
libavformat/libnut.c	diff1 \|	diff2 \|	blob \| history
libavformat/lmlm4.c	diff1 \|	diff2 \|	blob \| history
libavformat/loasdec.c	diff1 \|	\|	blob \| history
libavformat/lxfdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/matroskadec.c	diff1 \|	diff2 \|	blob \| history
libavformat/metadata.c	diff1 \|	diff2 \|	blob \| history
libavformat/metadata.h	diff1 \|	diff2 \|	blob \| history
libavformat/microdvddec.c	diff1 \|	\|	blob \| history
libavformat/mkvtimestamp_v2.c	diff1 \|	\|	blob \| history
libavformat/mm.c	diff1 \|	diff2 \|	blob \| history
libavformat/mmf.c	diff1 \|	diff2 \|	blob \| history
libavformat/mov.c	diff1 \|	diff2 \|	blob \| history
libavformat/movenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/movenc.h	diff1 \|	diff2 \|	blob \| history
libavformat/mp3dec.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpc8.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpeg.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpegenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpegts.c	diff1 \|	diff2 \|	blob \| history
libavformat/mpegtsenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/msnwc_tcp.c	diff1 \|	diff2 \|	blob \| history
libavformat/mtv.c	diff1 \|	diff2 \|	blob \| history
libavformat/mvi.c	diff1 \|	diff2 \|	blob \| history
libavformat/mxfdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/mxfenc.c	diff1 \|	diff2 \|	blob \| history
libavformat/mxg.c	diff1 \|	diff2 \|	blob \| history
libavformat/ncdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/nsvdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/nutdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/nuv.c	diff1 \|	diff2 \|	blob \| history
libavformat/oggdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/omadec.c	diff1 \|	diff2 \|	blob \| history
libavformat/options.c	diff1 \|	diff2 \|	blob \| history
libavformat/pmpdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/psxstr.c	diff1 \|	diff2 \|	blob \| history
libavformat/pva.c	diff1 \|	diff2 \|	blob \| history
libavformat/qcp.c	diff1 \|	diff2 \|	blob \| history
libavformat/r3d.c	diff1 \|	diff2 \|	blob \| history
libavformat/rawdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rawdec.h	diff1 \|	diff2 \|	blob \| history
libavformat/rl2.c	diff1 \|	diff2 \|	blob \| history
libavformat/rmdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rpl.c	diff1 \|	diff2 \|	blob \| history
libavformat/rsodec.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtsp.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtspdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/sapdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/sbgdec.c	diff1 \|	\|	blob \| history
libavformat/sdp.c	diff1 \|	diff2 \|	blob \| history
libavformat/segafilm.c	diff1 \|	diff2 \|	blob \| history
libavformat/sierravmd.c	diff1 \|	diff2 \|	blob \| history
libavformat/siff.c	diff1 \|	diff2 \|	blob \| history
libavformat/smacker.c	diff1 \|	diff2 \|	blob \| history
libavformat/sol.c	diff1 \|	diff2 \|	blob \| history
libavformat/soxdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/spdifdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/srtdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/swfdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/thp.c	diff1 \|	diff2 \|	blob \| history
libavformat/tiertexseq.c	diff1 \|	diff2 \|	blob \| history
libavformat/tmv.c	diff1 \|	diff2 \|	blob \| history
libavformat/tta.c	diff1 \|	diff2 \|	blob \| history
libavformat/tty.c	diff1 \|	diff2 \|	blob \| history
libavformat/txd.c	diff1 \|	diff2 \|	blob \| history
libavformat/url.h	diff1 \|	diff2 \|	blob \| history
libavformat/utils.c	diff1 \|	diff2 \|	blob \| history
libavformat/vc1test.c	diff1 \|	diff2 \|	blob \| history
libavformat/version.h	diff1 \|	diff2 \|	blob \| history
libavformat/vocdec.c	diff1 \|	diff2 \|	blob \| history
libavformat/vqf.c	diff1 \|	diff2 \|	blob \| history
libavformat/wav.c	diff1 \|	diff2 \|	blob \| history
libavformat/wc3movie.c	diff1 \|	diff2 \|	blob \| history
libavformat/westwood_vqa.c	diff1 \|	diff2 \|	blob \| history
libavformat/wtvdec.c	diff1 \|	\|	blob \| history
libavformat/wv.c	diff1 \|	diff2 \|	blob \| history
libavformat/xa.c	diff1 \|	diff2 \|	blob \| history
libavformat/xmv.c	diff1 \|	diff2 \|	blob \| history
libavformat/xwma.c	diff1 \|	diff2 \|	blob \| history
libavformat/yop.c	diff1 \|	diff2 \|	blob \| history
libavformat/yuv4mpeg.c	diff1 \|	diff2 \|	blob \| history
libavutil/file.c	diff1 \|	diff2 \|	blob \| history
libavutil/x86/x86inc.asm	diff1 \|	diff2 \|	blob \| history
libavutil/x86/x86util.asm	diff1 \|	diff2 \|	blob \| history
libswscale/x86/input.asm	diff1 \|	diff2 \|	blob \| history
libswscale/x86/output.asm	diff1 \|	diff2 \|	blob \| history
libswscale/x86/scale.asm	diff1 \|	diff2 \|	blob \| history
libswscale/x86/swscale_mmx.c	diff1 \|	diff2 \|	blob \| history
libswscale/x86/swscale_template.c	diff1 \|	diff2 \|	blob \| history
tests/codec-regression.sh	diff1 \|	diff2 \|	blob \| history
tests/lavf-regression.sh	diff1 \|	diff2 \|	blob \| history