Merge commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4'

* commit '08fa34bf75942f66796d770ff42a3721b2e3d2d4':
  yuv4mpegdec: initialize field_order in yuv4_read_header()

Conflicts:
	libavformat/yuv4mpegdec.c

See: 52a17972de
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-29 21:55:02 +01:00
commit c2ad22ff99

View File

@ -38,8 +38,8 @@ static int yuv4_read_header(AVFormatContext *s)
rated = 0, aspectn = 0, aspectd = 0;
enum AVPixelFormat pix_fmt = AV_PIX_FMT_NONE, alt_pix_fmt = AV_PIX_FMT_NONE;
enum AVChromaLocation chroma_sample_location = AVCHROMA_LOC_UNSPECIFIED;
AVStream *st;
enum AVFieldOrder field_order = AV_FIELD_UNKNOWN;
AVStream *st;
for (i = 0; i < MAX_YUV4_HEADER; i++) {
header[i] = avio_r8(pb);