Unified · Split
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "libavutil/mathematics.h" | 23 | #include "libavutil/mathematics.h" |
| 24 | #include "libavutil/tree.h" | 24 | #include "libavutil/tree.h" |
| 25 | #include "libavutil/dict.h" | 25 | #include "libavutil/dict.h" |
| 26 | #include "libavutil/avassert.h" | ||
| 26 | #include "libavcodec/mpegaudiodata.h" | 27 | #include "libavcodec/mpegaudiodata.h" |
| 27 | #include "nut.h" | 28 | #include "nut.h" |
| 28 | #include "internal.h" | 29 | #include "internal.h" |
| @@ -640,7 +641,7 @@ static int nut_write_header(AVFormatContext *s){ · 611 unmodified lines | |||
| 640 | nut->max_distance = MAX_DISTANCE; | 641 | nut->max_distance = MAX_DISTANCE; |
| 641 | build_elision_headers(s); | 642 | build_elision_headers(s); |
| 642 | build_frame_code(s); | 643 | build_frame_code(s); |
| 643 | assert(nut->frame_code['N'].flags == FLAG_INVALID); | 644 | av_assert0(nut->frame_code['N'].flags == FLAG_INVALID); |
| 644 | 645 | ||
| 645 | avio_write(bc, ID_STRING, strlen(ID_STRING)); | 646 | avio_write(bc, ID_STRING, strlen(ID_STRING)); |
| 646 | avio_w8(bc, 0); | 647 | avio_w8(bc, 0); |
| @@ -745,7 +746,7 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){ · 98 unmodified lines | |||
| 745 | 746 | ||
| 746 | ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0/*unused*/, pkt->dts); | 747 | ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0/*unused*/, pkt->dts); |
| 747 | } | 748 | } |
| 748 | assert(nus->last_pts != AV_NOPTS_VALUE); | 749 | av_assert0(nus->last_pts != AV_NOPTS_VALUE); |
| 749 | 750 | ||
| 750 | coded_pts = pkt->pts & ((1<<nus->msb_pts_shift)-1); | 751 | coded_pts = pkt->pts & ((1<<nus->msb_pts_shift)-1); |
| 751 | if(ff_lsb2full(nus, coded_pts) != pkt->pts) | 752 | if(ff_lsb2full(nus, coded_pts) != pkt->pts) |