• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 23c1db9b
    Michael Niedermayer authored
    * qatar/master:
      avconv: use different variables for decoded and filtered frame.
      avconv: add support for copying attachments.
      matroskaenc: write attachments.
      matroskadec: export mimetype of attachments as metadata.
      avconv: factorize common code from new_*_stream()
      doc/avconv: expand documentation for some options.
      doc/avconv: document -timelimit.
    
    Conflicts:
    	avconv.c
    	cmdutils.c
    	tests/codec-regression.sh
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    23c1db9b
matroskaenc.c 45.8 KB