Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1: Use codec ID from AVCodecContext while parsing frame header
  avplay: support mid-stream sample rate changes

Conflicts:
	ffplay.c
	libavcodec/vc1.c

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

diff --cc libavcodec/vc1.c
index ae07d17,a8dd38a..c24951b
--- 1/libavcodec/vc1.c
--- 2/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@@ -583,9 -576,7 +583,9 @@@ int ff_vc1_parse_frame_header(VC1Contex
  
      if (v->finterpflag)
          v->interpfrm = get_bits1(gb);
-     if (v->s.avctx->codec->id == AV_CODEC_ID_MSS2)
 +    if (!v->s.avctx->codec)
 +        return -1;
+     if (v->s.avctx->codec_id == AV_CODEC_ID_MSS2)
          v->respic   =
          v->rangered =
          v->multires = get_bits(gb, 2) == 1;