Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

nutenc: use av_assert

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/59/head
Michael Niedermayer 13 years ago
parent 53eaca5d6b
commit 4a6d790a6f
1 changed files with 3 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      libavformat/nutenc.c

5
libavformat/nutenc.c
Unescape View File

@ -23,6 +23,7 @@
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/tree.h" #include "libavutil/tree.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/avassert.h"
#include "libavcodec/mpegaudiodata.h" #include "libavcodec/mpegaudiodata.h"
#include "nut.h" #include "nut.h"
#include "internal.h" #include "internal.h"
@ -640,7 +641,7 @@ static int nut_write_header(AVFormatContext *s){
nut->max_distance = MAX_DISTANCE; nut->max_distance = MAX_DISTANCE;
build_elision_headers(s); build_elision_headers(s);
build_frame_code(s); build_frame_code(s);
assert(nut->frame_code['N'].flags == FLAG_INVALID); av_assert0(nut->frame_code['N'].flags == FLAG_INVALID);
avio_write(bc, ID_STRING, strlen(ID_STRING)); avio_write(bc, ID_STRING, strlen(ID_STRING));
avio_w8(bc, 0); avio_w8(bc, 0);
@ -745,7 +746,7 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){
ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0/*unused*/, pkt->dts); ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0/*unused*/, pkt->dts);
} }
assert(nus->last_pts != AV_NOPTS_VALUE); av_assert0(nus->last_pts != AV_NOPTS_VALUE);
coded_pts = pkt->pts & ((1<<nus->msb_pts_shift)-1); coded_pts = pkt->pts & ((1<<nus->msb_pts_shift)-1);
if(ff_lsb2full(nus, coded_pts) != pkt->pts) if(ff_lsb2full(nus, coded_pts) != pkt->pts)

Write Preview
Loading…
Cancel
Save