Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 20:48:25 +0000 (22:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 20:48:25 +0000 (22:48 +0200)
commitd52f874c7fa716f49bf35838d6bf0959016f48f6
tree57dc56cd59a4b505deb9b9cad5a452fbcb2c0519
parente932ae5940562ae0a183687053a5457a76fd1fa9
parentb8604a976128ffbd316653cdec11ba487f1025bb
Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'

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

Conflicts:
libavformat/oggparsecelt.c

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