Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jun 2011 00:33:59 +0000 (02:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jun 2011 01:00:31 +0000 (03:00 +0200)
commit46eb300d016b69b5fedb0410df98e3c698090c8c
tree7aa230d9098654e1ce94bc32c2cfb8f1463e9e3b
parent124a9edb5f172ce36b11fd0d6ccc9f15cc51f322
parent594fbe42c6b21aef76b938ce97524fa92a48e7a0
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>
20 files changed:
configure
libavcodec/Makefile
libavcodec/arm/mathops.h
libavcodec/mathops.h
libavcodec/mpc.h
libavcodec/mpc8.c
libavcodec/mpcdata.h
libavcodec/mpegaudiodectab.h
libavcodec/put_bits.h
libavcodec/tableprint.h
libavdevice/bktr.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavformat/ingenientdec.c
libavformat/network.h
libavformat/rawdec.c
libavformat/rawdec.h
libavformat/tty.c