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

avcodec/h264: Remove current_sps_id

Browse Source 
This should not be needed anymore and simplifies the next merge

Requested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-06-29 14:31:04 +02:00
parent 1eb43af1a0
commit e6e8750e94
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/h264.c
View File

@ -308,7 +308,6 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h)
h->backup_width = -1;
h->backup_height = -1;
h->backup_pix_fmt = AV_PIX_FMT_NONE;
h->current_sps_id = -1;
h->cur_chroma_format_idc = -1;
h->picture_structure = PICT_FRAME;

2
libavcodec/h264.h
View File

@ -516,8 +516,6 @@ typedef struct H264Context {
int b_stride; // FIXME use s->b4_stride
unsigned current_sps_id; ///< id of the current SPS
int au_pps_id; ///< pps_id of current access unit
uint16_t *slice_table; ///< slice_table_base + 2*mb_stride + 1

5
libavcodec/h264_slice.c
View File

@ -1171,9 +1171,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
}
}
if (h->ps.sps != (const SPS*)h->ps.sps_list[h->ps.pps->sps_id]->data ||
pps->sps_id != h->current_sps_id) {
if (h->ps.sps != (const SPS*)h->ps.sps_list[h->ps.pps->sps_id]->data) {
if (!first_slice) {
av_log(h->avctx, AV_LOG_ERROR,
"SPS changed in the middle of the frame\n");
@ -1783,7 +1781,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
}
h->au_pps_id = pps_id;
h->current_sps_id = h->ps.pps->sps_id;
if (h->avctx->debug & FF_DEBUG_PICT_INFO) {
av_log(h->avctx, AV_LOG_DEBUG,