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

lavc/utils: change a few asserts to av_assert0()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/30/merge
Michael Niedermayer 13 years ago
parent 36583d23bd
commit 011004152f
1 changed files with 3 additions and 3 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. 6
      libavcodec/utils.c

6
libavcodec/utils.c
Unescape View File

@ -554,7 +554,7 @@ void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){
InternalBuffer *buf, *last; InternalBuffer *buf, *last;
AVCodecInternal *avci = s->internal; AVCodecInternal *avci = s->internal;
assert(s->codec_type == AVMEDIA_TYPE_VIDEO); av_assert0(s->codec_type == AVMEDIA_TYPE_VIDEO);
assert(pic->type==FF_BUFFER_TYPE_INTERNAL); assert(pic->type==FF_BUFFER_TYPE_INTERNAL);
assert(avci->buffer_count); assert(avci->buffer_count);
@ -566,7 +566,7 @@ void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){
if (buf->data[0] == pic->data[0]) if (buf->data[0] == pic->data[0])
break; break;
} }
assert(i < avci->buffer_count); av_assert0(i < avci->buffer_count);
avci->buffer_count--; avci->buffer_count--;
last = &avci->buffer[avci->buffer_count]; last = &avci->buffer[avci->buffer_count];
@ -589,7 +589,7 @@ int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){
AVFrame temp_pic; AVFrame temp_pic;
int i; int i;
assert(s->codec_type == AVMEDIA_TYPE_VIDEO); av_assert0(s->codec_type == AVMEDIA_TYPE_VIDEO);
if (pic->data[0] && (pic->width != s->width || pic->height != s->height || pic->format != s->pix_fmt)) { if (pic->data[0] && (pic->width != s->width || pic->height != s->height || pic->format != s->pix_fmt)) {
av_log(s, AV_LOG_WARNING, "Picture changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s in reget buffer()\n", av_log(s, AV_LOG_WARNING, "Picture changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s in reget buffer()\n",

Write Preview
Loading…
Cancel
Save