Michael Niedermayer e37f161e66 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>		2012-01-28 07:53:34 +01:00
..
libvo
cpudetect.h
help_mp.h
img_format.c
img_format.h
mp_image.c
mp_image.h
mp_msg.h
mpbswap.h
mpc_info.h
pullup.c
pullup.h
vd_ffmpeg.h
vf.h
vf_2xsai.c
vf_decimate.c
vf_denoise3d.c
vf_detc.c
vf_dint.c
vf_divtc.c
vf_down3dright.c
vf_dsize.c
vf_eq.c
vf_eq2.c
vf_field.c
vf_fil.c
vf_filmdint.c
vf_fixpts.c
vf_framestep.c
vf_fspp.c
vf_geq.c
vf_harddup.c
vf_hqdn3d.c
vf_hue.c
vf_il.c
vf_ilpack.c
vf_ivtc.c
vf_kerndeint.c
vf_mcdeint.c
vf_mirror.c
vf_noise.c
vf_ow.c
vf_palette.c
vf_perspective.c
vf_phase.c
vf_pp7.c
vf_pullup.c
vf_qp.c
vf_rectangle.c
vf_remove_logo.c
vf_rotate.c
vf_sab.c
vf_scale.h
vf_screenshot.c
vf_smartblur.c
vf_softpulldown.c
vf_softskip.c
vf_spp.c
vf_stereo3d.c
vf_swapuv.c
vf_telecine.c
vf_tile.c
vf_tinterlace.c
vf_unsharp.c
vf_uspp.c
vf_yuvcsp.c
vf_yvu9.c
vfcap.h