Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Sep 2012 14:00:09 +0000 (16:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Sep 2012 14:00:09 +0000 (16:00 +0200)
commit0842e32f99105f06ad6b53f580ee777bc4bf9dee
treeb0b5b9ffcb9463556f7be33fdd5f43ba68d5fdfb
parent4c273eb64c1faa47ced1cfcf15a7a1af4d27dc44
parentd1f05dd18375f2f8e68372edee11436927e43ba8
Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8'

* commit 'd1f05dd18375f2f8e68372edee11436927e43ba8':
  ogg: calculate the start position once all the headers are parsed

Conflicts:
libavformat/oggdec.c
libavformat/oggparseskeleton.c

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