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