Commit c2ad22ff authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '08fa34bf'

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

Conflicts:
	libavformat/yuv4mpegdec.c

See: 52a17972Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e18e5ae6 08fa34bf
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment