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
..
aiff
alaw
asf	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
au
avi	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
bmp
caf	Add caf format regression test.	2011-12-11 09:45:17 +01:00
dpx	dpxenc: Dont store lavc indent when bitexact is set.	2012-01-17 01:37:59 +01:00
dv_fmt
ffm	lavc: increase major version to 54.	2012-01-27 10:38:30 +01:00
flv_fmt	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
gif
gxf	gxfenc: support timecode option	2011-12-07 15:29:26 +01:00
jpg
mkv	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
mmf
mov	Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs"	2012-01-22 23:40:24 +01:00
mpg
mulaw
mxf
mxf_d10
nut	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
ogg	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
pbmpipe
pcx
pgm
pgmpipe
pixfmt
png	Add gray16 and rgb48 png encoding regression tests.	2012-01-16 10:57:56 +01:00
ppm
ppmpipe
rm	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
rso	Enable already existing rso regression test.	2011-12-11 09:45:17 +01:00
sgi
sox	Add regression test for "sox" format muxer/demuxer.	2011-12-11 09:45:17 +01:00
swf
tga
tiff
ts	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
voc
voc_s16
wav
wtv	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
xwd	Merge remote-tracking branch 'qatar/master'	2012-01-27 02:09:58 +01:00
yuv4mpeg