Merge commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179'

* commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179':
  ansi: fix possible use of uninitialized variables

Conflicts:
	libavcodec/ansi.c

Only partially merged, ffmpeg is not affected by this.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/ansi.c
Simple merge