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