[FFmpeg-cvslog] Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 15:34:45 2014 +0100| [76c63bc5d8567817c229adc6a6fcd9cbd902f0d8] | committer: Michael Niedermayer

Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'

* commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f':
  lavf: remove a pointless check

Conflicts:
	libavformat/utils.c

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

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