• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 3bbf3f7e
    Michael Niedermayer authored
    * qatar/master:
      matroska: Clear prev_pkt between seeks.
      avutil: change default buffer size alignment for sample buffer functions
      audemux: Add a sanity check for the number of channels
      Remove libdirac decoder.
      matroska: Add incremental parsing of clusters.
      avconv: fix off by one check in complex_filter
      mpegts: Try seeking back even for nonseekable protocols
      swscale: K&R formatting cosmetics (part III)
    
    Conflicts:
    	configure
    	doc/general.texi
    	doc/platform.texi
    	ffmpeg.c
    	libavcodec/Makefile
    	libavcodec/allcodecs.c
    	libavcodec/libdirac.h
    	libavcodec/libdiracdec.c
    	libavformat/au.c
    	libavformat/mpegts.c
    	libswscale/input.c
    	tests/ref/seek/lavf_mkv
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    3bbf3f7e
Name
Last commit
Last update
..
fate Loading commit data...
ref Loading commit data...
Makefile Loading commit data...
asynth1.sw Loading commit data...
audiogen.c Loading commit data...
base64.c Loading commit data...
codec-regression.sh Loading commit data...
copycooker.sh Loading commit data...
fate-run.sh Loading commit data...
fate-update.sh Loading commit data...
fate-valgrind.supp Loading commit data...
fate.sh Loading commit data...
fate_config.sh.template Loading commit data...
ffserver-regression.sh Loading commit data...
ffserver.conf Loading commit data...
ffserver.regression.ref Loading commit data...
lavf-regression.sh Loading commit data...
lavfi-regression.sh Loading commit data...
lena.pnm Loading commit data...
md5.sh Loading commit data...
regression-funcs.sh Loading commit data...
rotozoom.c Loading commit data...
tiny_psnr.c Loading commit data...
videogen.c Loading commit data...