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