diff options
Diffstat (limited to 'libavcodec/cbs_h264_syntax_template.c')
| -rw-r--r-- | libavcodec/cbs_h264_syntax_template.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index c2fd546..267f35c 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -1,18 +1,18 @@ /* - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -721,7 +721,7 @@ static int FUNC(sei_payload)(CodedBitstreamContext *ctx, RWContext *rw, int start_position, end_position; #ifdef READ - start_position = bitstream_tell(rw); + start_position = get_bits_count(rw); #else start_position = put_bits_count(rw); #endif @@ -774,10 +774,10 @@ static int FUNC(sei_payload)(CodedBitstreamContext *ctx, RWContext *rw, } #ifdef READ - end_position = bitstream_tell(rw); + end_position = get_bits_count(rw); if (end_position < start_position + 8 * current->payload_size) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Incorrect SEI payload length: " - "header %d bits, actually %d bits.\n", + "header %"PRIu32" bits, actually %d bits.\n", 8 * current->payload_size, end_position - start_position); return AVERROR_INVALIDDATA; @@ -806,14 +806,14 @@ static int FUNC(sei)(CodedBitstreamContext *ctx, RWContext *rw, uint32_t payload_size = 0; uint32_t tmp; - while (bitstream_peek(rw, 8) == 0xff) { + while (show_bits(rw, 8) == 0xff) { xu(8, ff_byte, tmp, 0xff, 0xff); payload_type += 255; } xu(8, last_payload_type_byte, tmp, 0, 254); payload_type += tmp; - while (bitstream_peek(rw, 8) == 0xff) { + while (show_bits(rw, 8) == 0xff) { xu(8, ff_byte, tmp, 0xff, 0xff); payload_size += 255; } |
