[FFmpeg-cvslog] Merge commit '0279d1d0946a854aa08919abd05b7f2da433823e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr  1 03:42:29 2014 +0200| [013aa222c624c62fd61eb033803bc297b6681ea0] | committer: Michael Niedermayer

Merge commit '0279d1d0946a854aa08919abd05b7f2da433823e'

* commit '0279d1d0946a854aa08919abd05b7f2da433823e':
  sgi: fix end of line boundary detection

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

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