• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 46eb300d
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    46eb300d
bktr.c 10.9 KB