projects
/
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:
fed6c90
)
h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.
author
Alex Converse
<alex.converse@gmail.com>
Thu, 4 Aug 2011 00:31:11 +0000
(17:31 -0700)
committer
Alex Converse
<alex.converse@gmail.com>
Thu, 4 Aug 2011 00:56:47 +0000
(17:56 -0700)
libavcodec/h263dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/h263dec.c
b/libavcodec/h263dec.c
index 7f3411b779120903c8962764bd03493e4e8df1dd..cba0c5a20895514f4767c2459b64e0f8d52196a6 100644
(file)
--- a/
libavcodec/h263dec.c
+++ b/
libavcodec/h263dec.c
@@
-705,8
+705,8
@@
intrax8_decoded:
MPV_frame_end(s);
-
assert(s->current_picture.pict_type == s->current_picture_ptr->
pict_type);
-
assert(s->current_picture
.pict_type == s->pict_type);
+
assert(s->current_picture.f.pict_type == s->current_picture_ptr->f.
pict_type);
+
assert(s->current_picture.f
.pict_type == s->pict_type);
if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) {
*pict= *(AVFrame*)s->current_picture_ptr;
} else if (s->last_picture_ptr != NULL) {