• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 6716e689
    Michael Niedermayer authored
    * qatar/master:
      FATE: Add ZeroCodec test
      oggparseogm: fix order of arguments of avpriv_set_pts_info().
      pngenc: better upper bound for encoded frame size.
      aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
      aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
      aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
      aiffdec: do not set bit rate if block duration is unknown
      wmall: output packet only if we have decoded some samples
    
    Conflicts:
    	libavcodec/pngenc.c
    	tests/fate/lossless-video.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6716e689
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...