Mercurial > mplayer.hg

diff libmpdemux/demux_lavf.c @ 27516:3364aef9a988

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation after libavcodec major version 52 changes Some symbols were dropped or renamed, requiring corresponding changes in MPlayer. - Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample. - Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT. - Don't set AVCodecContext->rtp_mode (already marked unused before). - Use ff_eval2() instead of ff_eval().
author uau
date Mon, 08 Sep 2008 17:02:32 +0000
parents a126c38cb1c7
children 8e62ab83b282
line wrap: on
line diff
--- a/libmpdemux/demux_lavf.c	Mon Sep 08 12:36:38 2008 +0000
+++ b/libmpdemux/demux_lavf.c	Mon Sep 08 17:02:32 2008 +0000
@@ -252,7 +252,7 @@
             wf->nSamplesPerSec= codec->sample_rate;
             wf->nAvgBytesPerSec= codec->bit_rate/8;
             wf->nBlockAlign= codec->block_align ? codec->block_align : 1;
-            wf->wBitsPerSample= codec->bits_per_sample;
+            wf->wBitsPerSample= codec->bits_per_coded_sample;
             wf->cbSize= codec->extradata_size;
             if(codec->extradata_size)
                 memcpy(wf + 1, codec->extradata, codec->extradata_size);
@@ -328,7 +328,7 @@
             bih->biSize= sizeof(BITMAPINFOHEADER) + codec->extradata_size;
             bih->biWidth= codec->width;
             bih->biHeight= codec->height;
-            bih->biBitCount= codec->bits_per_sample;
+            bih->biBitCount= codec->bits_per_coded_sample;
             bih->biSizeImage = bih->biWidth * bih->biHeight * bih->biBitCount/8;
             bih->biCompression= codec->codec_tag;
             sh_video->bih= bih;