[FFmpeg-cvslog] vc1: loose one line difference to qatar.

[Reimar Döffinger]

On Thu, Sep 01, 2011 at 04:20:55AM +0200, Michael Niedermayer wrote:
> ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep  1 02:38:56 2011 +0200| [a538e0f9a0c8f0bc2d4da99944997f6c0dcca503] | committer: Michael Niedermayer
> 
> vc1: loose one line difference to qatar.
> This should make no functional difference.
> 
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> 
> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a538e0f9a0c8f0bc2d4da99944997f6c0dcca503
> ---
> 
>  libavcodec/vc1.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
> index 268ceb3..3b3e20e 100644
> --- a/libavcodec/vc1.c
> +++ b/libavcodec/vc1.c
> @@ -470,7 +470,7 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
>      }
>      v->s.max_b_frames = v->s.avctx->max_b_frames = 7;
>      if(get_bits1(gb)) { //Display Info - decoding is not affected by it
> -        int dw, dh, ar = 0;
> +        int w, h, ar = 0;
>          av_log(v->s.avctx, AV_LOG_DEBUG, "Display extended info:\n");
>          w = get_bits(gb, 14) + 1;
>          h = get_bits(gb, 14) + 1;

Except that they are useless, w and h are already defined.
And the only reason they are unused is because the really useful part
of the change got lost, now the encoded display width/height are
completely ignored.
Before there was a
v->s.avctx->sample_aspect_ratio = av_div_q((AVRational){dw, dh}, (AVRational){w, h});