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)
commit446d62f0cfea35ad1695f756b5275288498e51e1
treeca3a8425407f0b2f1fff00e4575f7e82b6ac3708
parentd235d240d8ba88b931cb9ca0aca2cfa586c7eea0
parent69c25c9284645cf5189af2ede42d6f53828f3b45
Merge commit '69c25c9284645cf5189af2ede42d6f53828f3b45'

* 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>
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