[FFmpeg-cvslog] Merge commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov  3 12:58:54 2013 +0100| [b568eeba75249813ea844e65bd57665a0dee9e55] | committer: Michael Niedermayer

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

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