Merge commit '67fc8a15e4182ea111cfcd05897709f09d99a33a'

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

Conflicts:
	libavcodec/vp3.c

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

diff --cc libavcodec/vp3.c
index 0e37f0d,52c68d2..c7398e6
--- 1/libavcodec/vp3.c
--- 2/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@@ -1730,9 -1723,9 +1732,9 @@@ static av_cold int vp3_decode_init(AVCo
          s->version = 1;
  
      s->avctx  = avctx;
-     s->width  = FFALIGN(avctx->width, 16);
-     s->height = FFALIGN(avctx->height, 16);
+     s->width  = FFALIGN(avctx->coded_width, 16);
+     s->height = FFALIGN(avctx->coded_height, 16);
 -    if (avctx->pix_fmt == AV_PIX_FMT_NONE)
 +    if (avctx->codec_id != AV_CODEC_ID_THEORA)
          avctx->pix_fmt = AV_PIX_FMT_YUV420P;
      avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
      ff_hpeldsp_init(&s->hdsp, avctx->flags | CODEC_FLAG_BITEXACT);