Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 19:08:01 +0000 (21:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 19:18:36 +0000 (21:18 +0200)
commita26ecba07514317d500d1af64bdfc5b53148c408
tree55e449a10cba6eb6f491380944567945b3743201
parenteee6ad38f99ad38b7d60382f572cbd5542a80c4c
parent52a1c32c0a86e84d43f977c5148e62975a0c6917
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@gmx.at>
libavformat/nutdec.c