• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 3c54e7ed
    Michael Niedermayer authored
    * qatar/master:
      ac3enc: Add channel coupling support for the fixed-point AC-3 encoder.
      ac3enc: scale floating-point coupling channel coefficients in scale_coefficients() rather than in apply_channel_coupling()
      ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.
      wavpack: fix wrong return value in wavpack_decode_block()
      avconv: fix parsing metadata specifiers.
      fate: use +frame+slice named constants instead of '3'
      mpeg12: propagate more real return values through chunk decode error return and fix some indentation
      wavpack: use context reset in appropriate places
      avconv: move mux_preload and mux_max_delay to options context
      avconv: move bitstream filters to options context.
      avconv: move rate_emu to options context.
      avconv: move max_frames to options context.
      avconv: move metadata to options context.
      avconv: move ts scale to options context.
      avconv: move chapter maps to options context.
      avconv: move metadata maps to options context.
      avconv: move codec_names to options context.
    
    Conflicts:
    	avconv.c
    	tests/fate-run.sh
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    3c54e7ed
Name
Last commit
Last update
..
fate Loading commit data...
ref Loading commit data...
Makefile 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.mak Loading commit data...
fate.sh Loading commit data...
fate2.mak 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...