virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity

Merge commit '0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a'

Browse Source 
* commit '0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a':
  h264: remove unused H264SliceContext.rbsp_buffer

Merged-by: Clément Bœsch <clement@stupeflix.com>
This commit is contained in:
Clément Bœsch 2016-06-20 12:07:05 +02:00
commit cbe2dc7275
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264.c
View File

@ -373,8 +373,6 @@ static av_cold int h264_decode_end(AVCodecContext *avctx)
h->cur_pic_ptr = NULL;
for (i = 0; i < h->nb_slice_ctx; i++)
av_freep(&h->slice_ctx[i].rbsp_buffer);
av_freep(&h->slice_ctx);
h->nb_slice_ctx = 0;
@ -1108,9 +1106,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
goto end;
context_count = 0;
}
/* Slice could not be decoded in parallel mode, restart. Note
* that rbsp_buffer is not transferred, but since we no longer
* run in parallel mode this should not be an issue. */
/* Slice could not be decoded in parallel mode, restart. */
sl = &h->slice_ctx[0];
goto again;
}

4
libavcodec/h264.h
View File

@ -450,10 +450,6 @@ typedef struct H264SliceContext {
CABACContext cabac;
uint8_t cabac_state[1024];
int cabac_init_idc;
// rbsp buffer used for this slice
uint8_t *rbsp_buffer;
unsigned int rbsp_buffer_size;
} H264SliceContext;
/**