* commit 'b8604a97':
  oggparsecelt: do not set AVCodecContext.frame_size

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