OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cd6aa95
)
h264_parser: use av_assert
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 25 Jun 2012 19:12:22 +0000
(21:12 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 25 Jun 2012 21:10:45 +0000
(23:10 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_parser.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264_parser.c
b/libavcodec/h264_parser.c
index
3d55759
..
6a7acdc
100644
(file)
--- a/
libavcodec/h264_parser.c
+++ b/
libavcodec/h264_parser.c
@@
-31,8
+31,6
@@
#include "h264data.h"
#include "golomb.h"
-#include <assert.h>
-
static int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size)
{
@@
-324,7
+322,7
@@
static int h264_parse(AVCodecParserContext *s,
}
if(next<0 && next != END_NOT_FOUND){
- a
ssert
(pc->last_index + next >= 0 );
+ a
v_assert1
(pc->last_index + next >= 0 );
ff_h264_find_frame_end(h, &pc->buffer[pc->last_index + next], -next); //update state
}
}