diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-05 15:41:00 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-05 15:41:00 +0000 |
| commit | e3fe6113a6c66a82e707ac0e5731e22bcf63acd0 (patch) | |
| tree | 57aac37bf5545ff05c819980bd5a729977faf05d /libmpdemux | |
| parent | 9e1add871ebacc3844c70fec93c086c141b51794 (diff) | |
| download | mpv-e3fe6113a6c66a82e707ac0e5731e22bcf63acd0.tar.bz2 mpv-e3fe6113a6c66a82e707ac0e5731e22bcf63acd0.tar.xz | |
sizeof() is long, thus %d format in error message is wrong.
Fix by assigning extradata_size before and printing that, since
this also removes a bit of code duplication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21828 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/muxer_lavf.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index 948b41b754..97c3558a37 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -251,15 +251,16 @@ static void fix_parameters(muxer_stream_t *stream) ctx->time_base.num = stream->h.dwScale; if(stream->bih+1 && (stream->bih->biSize > sizeof(BITMAPINFOHEADER))) { - ctx->extradata = av_malloc(stream->bih->biSize - sizeof(BITMAPINFOHEADER)); + ctx->extradata_size = stream->bih->biSize - sizeof(BITMAPINFOHEADER); + ctx->extradata = av_malloc(ctx->extradata_size); if(ctx->extradata != NULL) - { - ctx->extradata_size = stream->bih->biSize - sizeof(BITMAPINFOHEADER); memcpy(ctx->extradata, stream->bih+1, ctx->extradata_size); - } else + { mp_msg(MSGT_MUXER, MSGL_ERR, "MUXER_LAVF(video stream) error! couldn't allocate %d bytes for extradata\n", - stream->bih->biSize - sizeof(BITMAPINFOHEADER)); + ctx->extradata_size); + ctx->extradata_size = 0; + } } } } |