Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Dec 2012 13:43:03 +0000 (14:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Dec 2012 13:43:03 +0000 (14:43 +0100)
commitc6664242e0700ea0bc10109c7e84c3f9cf7fb9ae
tree6189919f30f099df68d75cc3ba3d30ec1347467f
parent98b7a50a2100e3dad96821d2c0adac369652707d
parentf5f1cf52240759208b42477e2157a7b4409ade10
Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10'

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

Conflicts:
libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/hlsenc.c
libavformat/oggdec.c