ffmpeg/libavformat
Michael Niedermayer 46eb300d01 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: remove MULL inline asm
  mathops: use MUL64 macro where it forms part of other ops
  tty: factorise returning error codes.
  rawdec: add framerate private option.
  x11grab: add framerate private option.
  fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base.
  bktr: don't error when AVFormatParameters.time_base isn't set.
  cmdutils: add missing const qualifier
  Skip headers not designed to work standalone during 'make checkheaders'.
  Add missing #includes to make headers self-contained.
  musepack: remove unnecessary #include from mpcdata.h
  musepack: remove extraneous mpcdata.h inclusions
  Fix error check in av_file_map()

Conflicts:
	cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-05 03:00:31 +02:00
..
2011-05-06 17:39:31 +02:00
2011-05-15 03:25:57 +02:00
2011-05-13 04:40:40 +02:00
2011-04-17 23:43:54 +02:00
2011-04-04 02:15:12 +02:00
2011-04-07 03:32:26 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-06-02 20:06:00 +01:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-10 03:32:29 +02:00
2011-04-09 03:17:07 +02:00
2011-04-30 01:58:26 +02:00
2011-05-05 03:30:24 +02:00
2011-04-04 02:15:12 +02:00
2011-04-18 18:23:16 +02:00
2011-04-21 03:37:05 +02:00
2011-04-09 03:17:07 +02:00
2011-04-04 02:15:12 +02:00
2011-04-17 23:43:54 +02:00
2011-05-24 01:31:53 +02:00
2011-04-07 03:32:26 +02:00
2011-04-20 04:48:23 +02:00
2011-04-07 03:32:26 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 02:15:12 +02:00
2011-05-07 09:47:35 +02:00
2011-06-03 21:14:30 +02:00
2011-06-02 20:06:00 +01:00
2011-04-24 03:41:22 +02:00
2011-05-24 01:31:53 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-05-20 01:44:10 +02:00
2011-05-20 01:44:10 +02:00
2011-05-10 04:03:17 +02:00
2011-04-09 03:17:07 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-05-20 01:44:10 +02:00
2011-04-02 01:54:27 +02:00
2011-06-02 20:06:00 +01:00
2011-04-04 02:15:12 +02:00
2011-05-30 02:39:26 +02:00
2011-04-04 02:15:12 +02:00
2011-06-03 15:48:08 +02:00
2011-05-01 21:13:18 +02:00
2011-05-01 21:13:18 +02:00
2011-04-04 02:15:12 +02:00
2011-06-02 20:06:00 +01:00