• 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
Name
Last commit
Last update
..
aac.mak Loading commit data...
als.mak Loading commit data...
amrnb.mak Loading commit data...
amrwb.mak Loading commit data...
dct.mak Loading commit data...
fft.mak Loading commit data...
h264.mak Loading commit data...
libavutil.mak Loading commit data...
mp3.mak Loading commit data...
prores.mak Loading commit data...
vorbis.mak Loading commit data...
vp8.mak Loading commit data...