Merge commit '7d56f2fffc14ad02001ee0689bee76a759da9ede'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Feb 2014 04:05:11 +0000 (05:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Feb 2014 04:07:42 +0000 (05:07 +0100)
* commit '7d56f2fffc14ad02001ee0689bee76a759da9ede':
  mxf: Handle negative edit_rate

Conflicts:
libavformat/mxfdec.c

See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mxfdec.c

Simple merge