[FFmpeg-cvslog] Merge commit 'c716624853339ea4b1086a3957b334829370204c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb  2 05:23:59 2014 +0100| [23e48cd01fbd314ea0d8ab0a6bb00be3e1c8afec] | committer: Michael Niedermayer

Merge commit 'c716624853339ea4b1086a3957b334829370204c'

* commit 'c716624853339ea4b1086a3957b334829370204c':
  mxf: Read field dominance flag

Conflicts:
	libavformat/mxfdec.c

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

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