diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 13:13:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-12 13:18:28 +0100 |
| commit | fe54f6cb453c030f9aae2a703bf1e1e00caeb041 (patch) | |
| tree | d5e724bd65a1725c398dd08e9715f6d3b877e9bc /libavcodec/h264.c | |
| parent | e2b703f53612680f4be6721e51100bd552d55dd8 (diff) | |
| parent | 4c51fe48ba6dde059360b7451db7f6bbf2f11db3 (diff) | |
Merge commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3'
* commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3':
h264: Copy h264chroma dsp context to slice thread copies
swscale: Disallow conversion to GBRP16
Conflicts:
libswscale/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 2d6c5e63ba..4687a8ffa7 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2638,8 +2638,8 @@ static int h264_slice_header_init(H264Context *h, int reinit) memcpy(c, h->s.thread_context[i], sizeof(MpegEncContext)); memset(&c->s + 1, 0, sizeof(H264Context) - sizeof(MpegEncContext)); c->h264dsp = h->h264dsp; - c->h264chroma = h->h264chroma; c->h264qpel = h->h264qpel; + c->h264chroma = h->h264chroma; c->sps = h->sps; c->pps = h->pps; c->pixel_shift = h->pixel_shift; |