[FFmpeg-cvslog] Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 25 16:00:09 2012 +0200| [0842e32f99105f06ad6b53f580ee777bc4bf9dee] | committer: Michael Niedermayer

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 at gmx.at>

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