1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
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-11-05 16:51:25 +01:00
2011-04-04 02:15:12 +02:00
2011-11-08 00:36:45 +02:00
2011-08-01 00:58:49 +02:00
2011-08-22 09:35:58 +02:00
2011-04-09 03:17:07 +02:00
2011-08-09 19:56:25 +02:00
2011-11-08 00:09:44 +01:00
2011-10-29 22:08:25 +02:00
2011-04-21 03:37:05 +02:00
2011-11-03 20:21:01 +01:00
2011-04-20 04:48:23 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-11-01 12:59:15 +01:00
2011-11-02 20:41:24 +01:00
2011-08-09 19:56:25 +02:00
2011-06-02 20:06:00 +01:00
2011-10-13 16:50:20 +02:00
2011-04-04 02:15:12 +02:00
2011-04-24 03:41:22 +02:00
2011-10-17 16:51:48 +02:00
2011-05-30 02:39:26 +02:00
2011-10-27 01:03:22 +02:00
2011-08-25 21:43:30 +02:00
2011-11-06 11:53:05 +02:00
2011-11-06 01:53:46 +01:00