Merge commit '67fc8a15e4182ea111cfcd05897709f09d99a33a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 02:42:16 +0000 (03:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 02:42:16 +0000 (03:42 +0100)
commit6fcdcc414b6541cb6548f462710d344fb844bafc
tree4fdfb1bdbdd30c1c18403977cacd343ba0d807bb
parent3e889713ce45b938c91662339d3e9b1ff4d1be1a
parent67fc8a15e4182ea111cfcd05897709f09d99a33a
Merge commit '67fc8a15e4182ea111cfcd05897709f09d99a33a'

* commit '67fc8a15e4182ea111cfcd05897709f09d99a33a':
  theora: support different visible and coded frame size

Conflicts:
libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vp3.c