ffmpeg/libavcodec
Michael Niedermayer 0bd42ae72c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avformat: Avoid a warning about mixed declarations and code
  BMV demuxer and decoder
  matroskaenc: Make sure the seekhead struct is freed even on seek failure
  mpeg12enc: Remove write-only variables.
  mpeg12enc: Don't set up run-level info for level 0.
  msmpeg4: Don't set up run-level info for level 0.
  avformat: Warn about using network functions without calling avformat_network_init
  avformat: Revise wording
  rdt: Set AVFMT_NOFILE on ff_rdt_demuxer
  rdt: Check the return value of avformat_open
  rtsp: Discard the dynamic handler, if it has an alloc function which failed
  dsputil: use cpuflags in x86 versions of vector_clip_int32()

Conflicts:
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

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