Skip to content
  • Michael Niedermayer's avatar
    be2e211d
    Merge remote-tracking branch 'qatar/master' · be2e211d
    Michael Niedermayer authored
    
    
    * qatar/master:
      doxy: remove reference to removed api
      examples: unbreak compilation
      ttadec: cosmetics: reindent
      sunrast: use RLE trigger macro inplace of the hard coded value.
      sunrastenc: set keyframe flag for the output packet.
      mpegvideo_enc: switch to encode2().
      mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0
    
    Conflicts:
    	doc/examples/muxing.c
    
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    be2e211d
    Merge remote-tracking branch 'qatar/master'
    Michael Niedermayer authored
    
    
    * qatar/master:
      doxy: remove reference to removed api
      examples: unbreak compilation
      ttadec: cosmetics: reindent
      sunrast: use RLE trigger macro inplace of the hard coded value.
      sunrastenc: set keyframe flag for the output packet.
      mpegvideo_enc: switch to encode2().
      mpegvideo_enc: force encoding delay of at least 1 frame when low_delay=0
    
    Conflicts:
    	doc/examples/muxing.c
    
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
Loading