[FFmpeg-cvslog] Merge commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 26 23:32:29 2015 +0200| [dcc540db6ee0f41edd09b40d9854fb1a6509eab3] | committer: Michael Niedermayer

Merge commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53'

* commit '342b0ba5f93b09b1d0c2597db44605300e6fcc53':
  configure: Only redirect strtoll to _strtoi64 if necessary

Conflicts:
	configure

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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