Merge commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Nov 2013 11:58:54 +0000 (12:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Nov 2013 11:58:54 +0000 (12:58 +0100)
* 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>
1  2 
libavcodec/ansi.c

Simple merge