• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7f92f3d8
    Michael Niedermayer authored
    * qatar/master:
      h264: fix frame reordering code.
      fate: Add a test for the VBLE decoder
      doc: break some long lines in developer.texi
      drawtext: make x and y parametric
      drawtext: manage memory allocation better
      drawtext: refactor draw_text
      doc: remove space between variable and post increment in example code
    
    Conflicts:
    	doc/developer.texi
    	doc/filters.texi
    	libavcodec/h264.c
    	libavfilter/vf_drawtext.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7f92f3d8
fate2.mak 9.08 KB