[FFmpeg-cvslog] Merge commit '3b199d29cd597a3518136d78860e172060b9e83d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 03:51:59 2013 +0100| [b5e5ed8ea707fefcab15dbfa3fa0dc2f36e5275a] | committer: Michael Niedermayer

Merge commit '3b199d29cd597a3518136d78860e172060b9e83d'

* commit '3b199d29cd597a3518136d78860e172060b9e83d':
  lavc decoders: properly initialize AVFrame.

Conflicts:
	libavcodec/avs.c
	libavcodec/c93.c
	libavcodec/cinepak.c
	libavcodec/flashsv.c
	libavcodec/flicvideo.c
	libavcodec/iff.c
	libavcodec/mmvideo.c
	libavcodec/msrle.c
	libavcodec/msvideo1.c
	libavcodec/qtrle.c
	libavcodec/rpza.c
	libavcodec/smacker.c
	libavcodec/smc.c
	libavcodec/tiertexseqv.c
	libavcodec/truemotion1.c

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

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