[FFmpeg-cvslog] Merge commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 24 14:55:14 2013 +0200| [0ebc3728561cc7a875c33bf1a5590d31eb53d9ac] | committer: Michael Niedermayer

Merge commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d'

* commit '5f24fe82e5fcf227abb5ebf62aa9bc246fda8c0d':
  mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0

Conflicts:
	libavcodec/mpegvideo.c

The chroma_*_shift and codec_tag code was not under a size!=0 check in ffmpeg

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

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