virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

rtpenc_h263_rfc2190: avoid misleading error output

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Thomas Volkert 2014-09-21 17:43:16 +02:00 committed by Michael Niedermayer
parent f3aaec781a
commit e1cddd1a0c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/rtpenc_h263_rfc2190.c
View File

@ -150,9 +150,12 @@ void ff_rtp_send_h263_rfc2190(AVFormatContext *s1, const uint8_t *buf, int size,
} }
if (mb_info_pos < mb_info_count) { if (mb_info_pos < mb_info_count) {
const uint8_t *ptr = &mb_info[12*mb_info_pos]; const uint8_t *ptr = &mb_info[12*mb_info_pos];
/* get position in bits in the input packet at which the next info block should be used */
uint32_t bit_pos = AV_RL32(ptr); uint32_t bit_pos = AV_RL32(ptr);
uint32_t pos = (bit_pos + 7)/8; /* get position in bytes */
if (pos <= end - buf_base) { uint32_t pos_next_mb_info = (bit_pos + 7)/8;
/* check if data from the next MB info block should be used */
if (pos_next_mb_info <= end - buf_base) {
state.quant = ptr[4]; state.quant = ptr[4];
state.gobn = ptr[5]; state.gobn = ptr[5];
state.mba = AV_RL16(&ptr[6]); state.mba = AV_RL16(&ptr[6]);
@ -160,13 +163,9 @@ void ff_rtp_send_h263_rfc2190(AVFormatContext *s1, const uint8_t *buf, int size,
state.vmv1 = (int8_t) ptr[9]; state.vmv1 = (int8_t) ptr[9];
state.hmv2 = (int8_t) ptr[10]; state.hmv2 = (int8_t) ptr[10];
state.vmv2 = (int8_t) ptr[11]; state.vmv2 = (int8_t) ptr[11];
ebits = 8 * pos - bit_pos; ebits = 8 * pos_next_mb_info - bit_pos;
len = pos - (buf - buf_base); len = pos_next_mb_info - (buf - buf_base);
mb_info_pos++; mb_info_pos++;
} else {
av_log(s1, AV_LOG_ERROR,
"Unable to split H263 packet, use -mb_info %d "
"or lower.\n", s->max_payload_size - 8);
} }
} else { } else {
av_log(s1, AV_LOG_ERROR, "Unable to split H263 packet, " av_log(s1, AV_LOG_ERROR, "Unable to split H263 packet, "