• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 15141f93
    Michael Niedermayer authored
    * qatar/master:
      indeo3: add parens around some macro arguments
      h264: use proper PROLOGUE statement for a function using 8 registers.
      doc: Update sample Vim config with suitable (function) indentation settings.
      dv: Merge dvquant.h into dvdata.c where all other DV tables reside.
      dv: Move static tables only used in one place to where they are used.
      graphparser: set next to NULL on an entry extracted from inputs list
      doc/filters: update documentation.
      avconv: flush decoders immediately after an EOF.
      avconv: send EOF to vsrc_buffer.
      avconv: reindent.
    
    Conflicts:
    	doc/filters.texi
    	ffmpeg.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    15141f93
dvdata.h 6.26 KB