• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · 6841c8c5
    Michael Niedermayer authored
    * qatar/master:
      log: Fix an oob array read.
      cosmetics: trim trailing whitespace in postproc
      Ban strncpy() it's too easy to misuse.
      psymodel: Remove wrapper functions.
      aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'.
      regtest: remove redundant flags in jpg test
      regtest: use run_ffmpeg in do_image_formats
      regtest: simplify encoding functions
      ffmpeg.c: check for interlaced flag in the correct place.
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6841c8c5
ffmpeg.c 165 KB