Merge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 22:53:36 +0000 (23:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 22:53:36 +0000 (23:53 +0100)
commit39f5003a07db14c3a98617c052570383c6c0fd35
tree72ba9057a2d27d6bced3de1d0e5c8141c5399c3c
parent618d2262d71e3eca9e01b2d03d0a7d5946737cf0
parent5b977c1d4fd99f325049d48fb8f0a3240d50eef8
Merge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8'

* commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8':
  mxf: Return meaningful errors

Conflicts:
libavformat/mxfdec.c

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