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>

1 files changed, 0 insertions, 1 deletions

diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index d8c488c3dd..03e5f194d7 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -1104,4 +1104,3 @@ void  pp_postprocess(const uint8_t * src[3], const int srcStride[3],
         }
     }
 }
-