Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 May 2011 02:27:07 +0000 (04:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 May 2011 02:50:56 +0000 (04:50 +0200)
commit6841c8c5791e857a3327411f23c13b0d28f69f1f
tree37f670ac509799ee0f4a067e2f632cc28a587082
parent25308afbb2f7d6d9cb1e36476bc5aa0b3831c703
parent847aaec682f2bbfaac55ee623364dd4527e0f341
Merge remote branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
libavcodec/aacenc.c
libavcodec/psymodel.c
libavcodec/psymodel.h
libavfilter/libmpcodecs/mp_image.h
libavutil/internal.h
libavutil/log.c
libpostproc/postprocess.c
tests/codec-regression.sh