[FFmpeg-cvslog] Merge commit '7d56f2fffc14ad02001ee0689bee76a759da9ede'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb  2 05:05:11 2014 +0100| [8fb67c102655dd4de08d99176039d7a404540b06] | committer: Michael Niedermayer

Merge commit '7d56f2fffc14ad02001ee0689bee76a759da9ede'

* commit '7d56f2fffc14ad02001ee0689bee76a759da9ede':
  mxf: Handle negative edit_rate

Conflicts:
	libavformat/mxfdec.c

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

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