Merge commit '69c25c9284645cf5189af2ede42d6f53828f3b45'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 13:33:06 +0000 (14:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 13:33:06 +0000 (14:33 +0100)
* commit '69c25c9284645cf5189af2ede42d6f53828f3b45':
  dnxhdenc: fix invalid reads in dnxhd_mb_var_thread().
  x86: h264qpel: Move stray comment to the right spot and clarify it
  atrac3: use correct loop variable in add_tonal_components()

Conflicts:
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-1080i

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dnxhdenc.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/h264_qpel.c
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-1080i

Simple merge
Simple merge
Simple merge
@@@ -1,4 -1,4 +1,4 @@@
- 9a4781b0a052d9efaafbaf8893db9632 *tests/data/fate/vsynth1-dnxhd-1080i.mov
 -2412f206f5efcbbcc3f2bba0c86b73d4 *tests/data/fate/vsynth1-dnxhd-1080i.mov
 -3031875 tests/data/fate/vsynth1-dnxhd-1080i.mov
 -34076f61254997c8157eafed1c916472 *tests/data/fate/vsynth1-dnxhd-1080i.out.rawvideo
++124c991ee3ac0caef39a58a45287a762 *tests/data/fate/vsynth1-dnxhd-1080i.mov
 +3031911 tests/data/fate/vsynth1-dnxhd-1080i.mov
- e55bf857297ba4d911a9d17a984b125d *tests/data/fate/vsynth1-dnxhd-1080i.out.rawvideo
++a09132c6db44f415e831dcaa630a351b *tests/data/fate/vsynth1-dnxhd-1080i.out.rawvideo
  stddev:    6.29 PSNR: 32.15 MAXDIFF:   64 bytes:  7603200/   760320
@@@ -1,4 -1,4 +1,4 @@@
- 93b878dcf8f2ecc9798d0e0885c9eec9 *tests/data/fate/vsynth2-dnxhd-1080i.mov
 -65ca6385b565b6ea9a2e28150eef1d46 *tests/data/fate/vsynth2-dnxhd-1080i.mov
 -3031875 tests/data/fate/vsynth2-dnxhd-1080i.mov
 -42262a2325441b38b3b3c8a42d888e7d *tests/data/fate/vsynth2-dnxhd-1080i.out.rawvideo
++5d7ab75ce6e547ed63a7a0eacf18f078 *tests/data/fate/vsynth2-dnxhd-1080i.mov
 +3031911 tests/data/fate/vsynth2-dnxhd-1080i.mov
- 27edc8dfe2ca19097c7f9119705b3a60 *tests/data/fate/vsynth2-dnxhd-1080i.out.rawvideo
++744ba46da5d4c19a28562ea31061d170 *tests/data/fate/vsynth2-dnxhd-1080i.out.rawvideo
  stddev:    1.31 PSNR: 45.77 MAXDIFF:   23 bytes:  7603200/   760320