-
Michael Niedermayer authored
* commit '5bee21d7 ': vf_delogo: fix copying the input frame. vf_delogo: fix an uninitialized read. dnxhdenc: fix invalid reads in dnxhd_mb_var_thread(). atrac3: use correct loop variable in add_tonal_components() Conflicts: libavfilter/vf_delogo.c tests/ref/vsynth/vsynth1-dnxhd-1080i tests/ref/vsynth/vsynth2-dnxhd-1080i Merged-by: Michael Niedermayer <michaelni@gmx.at>
5a3c8f95