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

Conflicts:
	libavformat/yuv4mpegdec.c

See: 52a17972Merged-by: Michael Niedermayer <michaelni@gmx.at>