git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
84e70ef
)
h264: Fix assert that failed to compile with -DDEBUG.
author
Diego Biurrun
<diego@biurrun.de>
Mon, 20 Jun 2011 23:11:28 +0000
(
01:11
+0200)
committer
Diego Biurrun
<diego@biurrun.de>
Tue, 21 Jun 2011 18:52:45 +0000
(20:52 +0200)
The assert referenced a variable that no longer exists since 4:4:4 support.
libavcodec/h264.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264.c
b/libavcodec/h264.c
index
dc4acb8
..
13a6380
100644
(file)
--- a/
libavcodec/h264.c
+++ b/
libavcodec/h264.c
@@
-1682,7
+1682,7
@@
static av_always_inline void hl_decode_mb_predict_luma(H264Context *h, int mb_ty
uint64_t tr_high;
if(dir == DIAG_DOWN_LEFT_PRED || dir == VERT_LEFT_PRED){
const int topright_avail= (h->topright_samples_available<<i)&0x8000;
- assert(mb_y || linesize <= block_offset[i]);
+ assert(
s->
mb_y || linesize <= block_offset[i]);
if(!topright_avail){
if (pixel_shift) {
tr_high= ((uint16_t*)ptr)[3 - linesize/2]*0x0001000100010001ULL;