[FFmpeg-cvslog] Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  9 22:48:25 2014 +0200| [d52f874c7fa716f49bf35838d6bf0959016f48f6] | committer: Michael Niedermayer

Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'

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

Conflicts:
	libavformat/oggparsecelt.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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