OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1c32609
)
Make sure field_select is not set to nonsensical values even if unused.
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 29 Nov 2009 01:50:43 +0000
(
01:50
+0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 29 Nov 2009 01:50:43 +0000
(
01:50
+0000)
Fixed an assert failure.
Originally committed as revision 20646 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mpeg12.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg12.c
b/libavcodec/mpeg12.c
index
b48d626
..
196930c
100644
(file)
--- a/
libavcodec/mpeg12.c
+++ b/
libavcodec/mpeg12.c
@@
-1847,7
+1847,7
@@
static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y,
s->mv[0][0][0] = s->mv[0][0][1] = 0;
s->last_mv[0][0][0] = s->last_mv[0][0][1] = 0;
s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0;
- s->field_select[0][0]=
s->picture_structure -
1;
+ s->field_select[0][0]=
(s->picture_structure - 1) &
1;
} else {
/* if B type, reuse previous vectors and directions */
s->mv[0][0][0] = s->last_mv[0][0][0];