• Michael Niedermayer's avatar
    Merge commit '69c25c92' · 446d62f0
    Michael Niedermayer authored
    * commit '69c25c92':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    446d62f0
vsynth2-dnxhd-1080i 273 Bytes