|
|
@ -1744,7 +1744,7 @@ static av_always_inline void backup_mb_border(H264Context *h, uint8_t *src_y, |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
top_border = h->top_borders[top_idx][s->mb_x]; |
|
|
|
top_border = h->top_borders[top_idx][s->mb_x]; |
|
|
|
/* There are two lines saved, the line above the the top macroblock
|
|
|
|
/* There are two lines saved, the line above the top macroblock
|
|
|
|
* of a pair, and the line above the bottom macroblock. */ |
|
|
|
* of a pair, and the line above the bottom macroblock. */ |
|
|
|
AV_COPY128(top_border, src_y + 16 * linesize); |
|
|
|
AV_COPY128(top_border, src_y + 16 * linesize); |
|
|
|
if (pixel_shift) |
|
|
|
if (pixel_shift) |
|
|
@ -4375,7 +4375,7 @@ again: |
|
|
|
if (ff_h264_decode_seq_parameter_set(h) < 0 && |
|
|
|
if (ff_h264_decode_seq_parameter_set(h) < 0 && |
|
|
|
h->is_avc && (nalsize != consumed) && nalsize) { |
|
|
|
h->is_avc && (nalsize != consumed) && nalsize) { |
|
|
|
av_log(h->s.avctx, AV_LOG_DEBUG, |
|
|
|
av_log(h->s.avctx, AV_LOG_DEBUG, |
|
|
|
"SPS decoding failure, try parsing the coomplete NAL\n"); |
|
|
|
"SPS decoding failure, trying again with the complete NAL\n"); |
|
|
|
init_get_bits(&s->gb, buf + buf_index + 1 - consumed, |
|
|
|
init_get_bits(&s->gb, buf + buf_index + 1 - consumed, |
|
|
|
8 * (nalsize - 1)); |
|
|
|
8 * (nalsize - 1)); |
|
|
|
ff_h264_decode_seq_parameter_set(h); |
|
|
|
ff_h264_decode_seq_parameter_set(h); |
|
|
|