diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:00:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:00:51 +0100 |
| commit | eba2c2321bc51b0faf5df379e5968ef2aa581cd8 (patch) | |
| tree | ef9ddfbde49c63bbd1695f9f95804d10ad7624a3 /libavcodec/h264_slice.c | |
| parent | 72bec029ee18aada1c54101f4fa0aa991355321c (diff) | |
| parent | 404a416d4b1fcbf9db5569481d8181f296c01ea9 (diff) | |
| download | ffmpeg-eba2c2321bc51b0faf5df379e5968ef2aa581cd8.tar.gz | |
Merge commit '404a416d4b1fcbf9db5569481d8181f296c01ea9'
* commit '404a416d4b1fcbf9db5569481d8181f296c01ea9':
h264: remove some remnants of data partitioning
Conflicts:
libavcodec/h264.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 670847bd11..639bbaf66c 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -531,8 +531,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, for (i = 0; i < MAX_PPS_COUNT; i++) av_freep(h->pps_buffers + i); - av_freep(&h->rbsp_buffer[0]); - av_freep(&h->rbsp_buffer[1]); + av_freep(&h->rbsp_buffer); ff_h264_unref_picture(h, &h->last_pic_for_ec); memcpy(h, h1, sizeof(H264Context)); @@ -566,10 +565,8 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->list_counts = NULL; h->mb2b_xy = NULL; h->mb2br_xy = NULL; - for (i = 0; i < 2; i++) { - h->rbsp_buffer[i] = NULL; - h->rbsp_buffer_size[i] = 0; - } + h->rbsp_buffer = NULL; + h->rbsp_buffer_size = 0; if (h1->context_initialized) { h->context_initialized = 0; |