diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-30 02:58:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-30 02:58:38 +0200 |
| commit | 55ce3c67bb25cd44889f2143ce9fd7dac3ab4a9d (patch) | |
| tree | 20f16981174b1d3469daf22217b98e24e311e62f /libavcodec | |
| parent | cd39549e2c386edfa5f4d4bdc0cda78f882a4fe4 (diff) | |
| download | ffmpeg-55ce3c67bb25cd44889f2143ce9fd7dac3ab4a9d.tar.gz | |
Merge remote-tracking branch 'ffmpeg-mt/master'
* ffmpeg-mt/master:
Update todo. More items appeared...
Fix mdec
Duplicate: id3v1: change filesize to int64_t.
Duplicate: id3v1: Seek back to old position after reading.
Conflicts:
libavcodec/mpegvideo.c
libavcodec/snow.c
libavformat/id3v1.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index b28ac26913..ba06641ab0 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -246,7 +246,7 @@ static av_cold int decode_init_thread_copy(AVCodecContext *avctx){ avctx->coded_frame= p; a->avctx= avctx; - p->qscale_table= av_mallocz( p->qstride * a->mb_height); + p->qscale_table= av_mallocz(a->mb_width); return 0; } |