h264: do not copy qscale when updating per-thread contexts
authorAnton Khirnov <anton@khirnov.net>
Sat, 17 Jan 2015 20:51:40 +0000 (21:51 +0100)
committerAnton Khirnov <anton@khirnov.net>
Sat, 21 Mar 2015 10:27:12 +0000 (11:27 +0100)
It's a per-slice quantity constructed when parsing the slice header.

libavcodec/h264_slice.c

index 6bdd261..d6ae9e7 100644 (file)
@@ -544,7 +544,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
     h->coded_picture_number = h1->coded_picture_number;
     h->first_field          = h1->first_field;
     h->picture_structure    = h1->picture_structure;
-    h->qscale               = h1->qscale;
     h->droppable            = h1->droppable;
     h->low_delay            = h1->low_delay;
 
@@ -1132,7 +1131,6 @@ static int h264_slice_header_init(H264Context *h, int reinit)
             c->uvlinesize        = h->uvlinesize;
             c->chroma_x_shift    = h->chroma_x_shift;
             c->chroma_y_shift    = h->chroma_y_shift;
-            c->qscale            = h->qscale;
             c->droppable         = h->droppable;
             c->low_delay         = h->low_delay;
             c->mb_width          = h->mb_width;