[FFmpeg-cvslog] Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 24 14:43:03 2012 +0100| [c6664242e0700ea0bc10109c7e84c3f9cf7fb9ae] | committer: Michael Niedermayer

Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10'

* commit 'f5f1cf52240759208b42477e2157a7b4409ade10':
  oggdec: K&R cosmetic formatting
  hlsenc: correctly report target duration

Conflicts:
	libavformat/oggdec.c

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

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