aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-01-17 21:51:40 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-21 11:27:12 +0100
commitd40ae0e595fe90b5583b9269f8bb000402bde5a6 (patch)
treece33fd85ee43b13b2b897478eba05961208a0c0b
parent92c6c2a605f9b077b8fbc25b7ed6625541232b87 (diff)
downloadffmpeg-d40ae0e595fe90b5583b9269f8bb000402bde5a6.tar.gz
h264: do not copy qscale when updating per-thread contexts
It's a per-slice quantity constructed when parsing the slice header.
-rw-r--r--libavcodec/h264_slice.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 6bdd261de7..d6ae9e7ca8 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -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;