diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:20:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:20:54 +0100 |
| commit | cc31d9ce80abd8b2a1a446f73a8651e2f1d76853 (patch) | |
| tree | 4fd3a8d617429f87ca9469150eb10e26db130454 | |
| parent | 756dc7bd18b88fdde5c06c701375a6570500e58c (diff) | |
| parent | d40ae0e595fe90b5583b9269f8bb000402bde5a6 (diff) | |
Merge commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6'
* commit 'd40ae0e595fe90b5583b9269f8bb000402bde5a6':
h264: do not copy qscale when updating per-thread contexts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_slice.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index ea2b97925c..2e55110802 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -604,7 +604,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; @@ -1228,7 +1227,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; |