Merge commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Oct 2012 13:12:54 +0000 (15:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Oct 2012 13:12:54 +0000 (15:12 +0200)
commit1bd22229d7bf582d2749d4f96e1e2fca7f1dc044
tree5cb5cdb6a00296bbe871ecc4e2e073a368d167eb
parentd19728da6f0048d4f6208a34c849aee61c8e2b2a
parent73871dc96ff78053b9dcd0eb259b7f5a5308ec87
Merge commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87'

* commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87':
  segment: Use the public av_write_header/av_write_trailer functions

Conflicts:
libavformat/segment.c

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