[FFmpeg-cvslog] Merge commit '5bee21d724dc47d115faae3f5065a6db74e1594a' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 14 12:22:53 2013 +0100| [5a3c8f95d5bfbab31ce4b460d41b193c4a2cfbb5] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a3c8f95d5bfbab31ce4b460d41b193c4a2cfbb5
---