Merge commit '48b80f8393d418ad35d73f5a36f5011de1928f3c'

* commit '48b80f8393d418ad35d73f5a36f5011de1928f3c':
  hpeldsp: Explain why put_no_rnd_pixels_tab is larger than necessary

Merged-by: Clément Bœsch <cboesch@gopro.com>

diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h
index 1a3cea54b885978a73f5a6386c4154a03053bc8c..768139bfc96e248e3a2c2cc608375c6806c4e509 100644 (file)
--- a/libavcodec/hpeldsp.h
+++ b/libavcodec/hpeldsp.h
@@ -76,6 +76,8 @@ typedef struct HpelDSPContext {
      * @param pixels source
      * @param line_size number of bytes in a horizontal line of block
      * @param h height
+     * @note The size is kept at [4][4] to match the above pixel_tabs and avoid
+     *       out of bounds reads in the motion estimation code.
      */
     op_pixels_func put_no_rnd_pixels_tab[4][4];