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
..
2012-01-28 07:53:34 +01:00
2011-07-05 02:26:17 +02:00
2011-09-16 20:44:27 +02:00
2011-11-24 03:32:24 +01:00
2011-11-06 00:05:14 +01:00
2011-12-31 16:25:11 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-12-27 15:21:08 +01:00
2012-01-01 16:43:32 +01:00
2011-11-06 00:05:14 +01:00
2012-01-24 10:43:42 +01:00
2012-01-08 17:08:55 +01:00
2012-01-05 21:53:18 +01:00
2011-09-16 00:46:41 +02:00
2012-01-08 17:08:55 +01:00
2011-11-06 00:05:14 +01:00
2011-11-24 03:32:24 +01:00
2011-08-21 11:37:57 +02:00
2011-12-04 21:13:22 +01:00
2011-11-26 01:12:08 +01:00
2011-12-26 04:10:47 +01:00
2011-12-26 04:10:47 +01:00
2012-01-22 19:30:40 +01:00
2012-01-13 01:29:48 +01:00
2011-09-28 08:02:53 +02:00
2012-01-24 11:38:36 +01:00
2011-12-08 21:19:23 +01:00
2011-12-25 16:18:57 +01:00
2012-01-12 16:32:54 +01:00
2011-10-28 02:06:50 +02:00
2011-10-28 02:06:50 +02:00
2011-12-22 10:09:42 +01:00
2011-05-17 03:05:36 +02:00
2012-01-24 11:38:36 +01:00
2011-09-28 08:02:53 +02:00
2012-01-12 16:32:54 +01:00
2012-01-26 02:23:56 +01:00
2011-12-22 10:09:42 +01:00
2011-12-26 04:10:47 +01:00
2011-12-13 21:08:43 +01:00
2011-10-20 15:59:20 +02:00
2012-01-24 11:38:36 +01:00
2011-11-06 00:05:14 +01:00
2011-11-26 10:42:33 +01:00
2011-11-06 00:05:14 +01:00
2011-11-25 04:45:41 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2012-01-21 05:22:49 +01:00
2011-11-06 00:05:14 +01:00
2012-01-11 18:14:03 +01:00
2012-01-20 00:16:27 +01:00
2011-11-06 00:05:14 +01:00
2011-11-21 19:35:33 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2012-01-26 02:23:56 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2012-01-21 14:40:46 +01:00
2011-11-06 00:05:14 +01:00
2012-01-15 09:12:03 +01:00
2011-11-14 05:42:10 +01:00
2011-11-06 00:05:14 +01:00
2011-12-06 15:03:51 +01:00
2011-11-16 07:48:23 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-12-27 11:15:21 +01:00
2012-01-01 16:16:50 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2012-01-20 00:16:27 +01:00
2011-11-06 00:05:14 +01:00
2012-01-13 01:29:48 +01:00
2011-09-19 12:43:10 +02:00
2011-12-11 11:55:33 +01:00
2012-01-20 00:16:27 +01:00
2011-12-11 14:14:01 +01:00
2012-01-21 14:40:46 +01:00
2011-11-06 00:05:14 +01:00
2012-01-17 12:03:30 +01:00
2011-04-03 08:46:19 +02:00