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>

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;
 }