diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 18:03:23 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 18:03:23 +0300 |
| commit | 392080cbe52868c00f8dfd4e60639c37a13165f4 (patch) | |
| tree | 3039ea6b0b267230503f674a0c355cc73049e2c6 /libavcodec/h264_slice.c | |
| parent | f25f15b6e1c4f597b0d31fb5b9fe7e8e40dd0fb1 (diff) | |
| parent | 167e004e1aca7765686ed95d7cd8ea5064d4f6f6 (diff) | |
Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'
* commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6':
h264: drop any pretense of support for data partitioning
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index c7e6dd3233..85d571490e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1223,7 +1223,6 @@ static int h264_slice_header_init(H264Context *h, int reinit) c->chroma_y_shift = h->chroma_y_shift; c->qscale = h->qscale; c->droppable = h->droppable; - c->data_partitioning = h->data_partitioning; c->low_delay = h->low_delay; c->mb_width = h->mb_width; c->mb_height = h->mb_height; |