]> git.sesse.net Git - ffmpeg/commit
Merge commit 'c716624853339ea4b1086a3957b334829370204c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Feb 2014 04:23:59 +0000 (05:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Feb 2014 04:23:59 +0000 (05:23 +0100)
commit23e48cd01fbd314ea0d8ab0a6bb00be3e1c8afec
treedbd6d2e1121a8d588694ffd09eff752ab3937116
parent8fb67c102655dd4de08d99176039d7a404540b06
parentc716624853339ea4b1086a3957b334829370204c
Merge commit 'c716624853339ea4b1086a3957b334829370204c'

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

Conflicts:
libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mxfdec.c