diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-08 17:02:32 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-08 17:02:32 +0000 |
| commit | 923f67082e60afc96d9efd2b88f75d992834c8a6 (patch) | |
| tree | 6dffb6b669c79ff11095ac6e23d607db1514cc79 /libmpdemux | |
| parent | b128f3e558af20ac6e7bbfedaf1c47c5860ec53c (diff) | |
| download | mpv-923f67082e60afc96d9efd2b88f75d992834c8a6.tar.bz2 mpv-923f67082e60afc96d9efd2b88f75d992834c8a6.tar.xz | |
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().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 06370ebdc9..e4798539d3 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -252,7 +252,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { 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 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) { 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; |