diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-15 23:20:25 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-15 23:20:25 +0300 |
commit | f3b6a8f554e24e617f1428678bf5aafefc6b8fb9 (patch) | |
tree | b23011721cacbc4de55bdc385ab6c65f0fac5f0e | |
parent | a848cf63dcc1b3185f84f80ddbbf8f3a468f5cae (diff) | |
parent | 53367b34e1156614e82ef7af888928f322566f88 (diff) |
Merge commit '53367b34e1156614e82ef7af888928f322566f88'
* commit '53367b34e1156614e82ef7af888928f322566f88':
rtp: h264: Drop the asserts
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavformat/rtpdec_h264.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index e32c08f1b1..89053efbdf 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -40,7 +40,6 @@ #include "avformat.h" #include "network.h" -#include <assert.h> #include "rtpdec.h" #include "rtpdec_formats.h" @@ -153,8 +152,6 @@ static int sdp_parse_fmtp_config_h264(AVFormatContext *s, char *attr, char *value) { AVCodecContext *codec = stream->codec; - assert(codec->codec_id == AV_CODEC_ID_H264); - assert(h264_data); if (!strcmp(attr, "packetization-mode")) { av_log(s, AV_LOG_DEBUG, "RTP Packetization Mode: %d\n", atoi(value)); @@ -205,7 +202,6 @@ static int h264_handle_packet_stap_a(AVFormatContext *ctx, AVPacket *pkt, total_length += sizeof(start_sequence) + nal_size; } else { // copying - assert(dst); memcpy(dst, start_sequence, sizeof(start_sequence)); dst += sizeof(start_sequence); memcpy(dst, src, nal_size); @@ -232,8 +228,6 @@ static int h264_handle_packet_stap_a(AVFormatContext *ctx, AVPacket *pkt, if ((ret = av_new_packet(pkt, total_length)) < 0) return ret; dst = pkt->data; - } else { - assert(dst - pkt->data == total_length); } } @@ -295,9 +289,6 @@ static int h264_handle_packet(AVFormatContext *ctx, PayloadContext *data, nal = buf[0]; type = nal & 0x1f; - assert(data); - assert(buf); - /* Simplify the case (these are all the nal types used internally by * the h264 codec). */ if (type >= 1 && type <= 23) |