Merge commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 22:27:23 +0000 (00:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 22:28:08 +0000 (00:28 +0200)
commit5313d60dc0f2287f61a900a1f2b9d910eeb2bdbf
tree64bf455e46b2bd22bd8b9ccbad7a5a8d126724cc
parent48a691630833d6b12905475b6bf39fef285872a9
parent1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1
Merge commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1'

* commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1':
  oggenc: Move ogg_write_pages up above ogg_write_header

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