• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 4dcd1a31
    Michael Niedermayer authored
    * qatar/master:
      adtsenc: Check frame size.
      txd: Fix order of operations.
      APIchanges: fill in some blanks
      timer: fix misspelling of "decicycles"
      Eliminate pointless 0/NULL initializers in AVCodec and similar declarations.
      indeo3: cosmetics
      md5proto: Fix order of operations.
      dca: Replace oversized unused get_bits() with skip_bits_long().
    
    Conflicts:
    	doc/APIchanges
    	libavformat/mmsh.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    4dcd1a31
txd.c 5.49 KB