[FFmpeg-cvslog] Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul  8 21:08:01 2014 +0200| [a26ecba07514317d500d1af64bdfc5b53148c408] | committer: Michael Niedermayer

Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'

* commit '52a1c32c0a86e84d43f977c5148e62975a0c6917':
  nut: Use nut->version in the version range check

Conflicts:
	libavformat/nutdec.c

Note, this bug did not affect ffmpeg
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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