• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · bd4ebbbb
    Michael Niedermayer authored
    * qatar/master:
      proresdsp: fix function prototypes.
      prores-idct: fix overflow in c code.
      fate: update prores-alpha ref after changing pix_fmt to yuv444p10le
      prores: add missing feature warning for alpha
      mov: 10l: Terminate string with 0 not '0'
      mov: Prevent illegal writes when chapter titles are very short.
      prores: add appropriate -fix_fmt parameter to FATE command
      riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header
      lavc: add a flag-based error_recognition field to AVCodecContext and deprecate non-flag-based ER field
      lavc: rename deprecation symbol FF_API_VERY_AGGRESSIVE to FF_API_ER
    
    Conflicts:
    	libavcodec/avcodec.h
    	libavformat/mov.c
    	tests/fate/prores.mak
    	tests/ref/acodec/g726
    	tests/ref/fate/prores-alpha
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    bd4ebbbb
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...