Merge commit 'af9481d7'

* commit 'af9481d7': mxf: Lowercase UL strings Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'af9481d7'
* commit 'af9481d7': mxf: Lowercase UL strings Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2ef6c0fd · Michael Niedermayer · 3e59db60 · af9481d7 · 2ef6c0fd
Commit 2ef6c0fd authored Mar 19, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 42 additions and 42 deletions

mxfdec.c libavformat/mxfdec.c +42 -42

No files found.
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c