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