Merge commit '5bee21d724dc47d115faae3f5065a6db74e1594a' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 11:22:53 +0000 (12:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 11:27:48 +0000 (12:27 +0100)
commit5a3c8f95d5bfbab31ce4b460d41b193c4a2cfbb5
treec7536b2268bd04e76235ef487e954ee0e72cc317
parent358e4081edb8eae53eacc73ac224d35278f1433a
parent5bee21d724dc47d115faae3f5065a6db74e1594a
Merge commit '5bee21d724dc47d115faae3f5065a6db74e1594a' into release/1.1

* commit '5bee21d724dc47d115faae3f5065a6db74e1594a':
  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>
libavcodec/dnxhdenc.c
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-1080i