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:
411cc5c
)
mpeg12dec: if lavc's mpeg2 decoder was asked to drop a frame, it could still output...
author
Joakim Plate
<elupus@ecce.se>
Mon, 12 Sep 2011 02:03:40 +0000
(
04:03
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 12 Sep 2011 02:03:40 +0000
(
04:03
+0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg12.c
b/libavcodec/mpeg12.c
index
970d1d5
..
6c48826
100644
(file)
--- a/
libavcodec/mpeg12.c
+++ b/
libavcodec/mpeg12.c
@@
-1968,7
+1968,7
@@
static int slice_end(AVCodecContext *avctx, AVFrame *pict)
ff_xvmc_field_end(s);
/* end of slice reached */
- if (/*s->mb_y << field_pic == s->mb_height &&*/ !s->first_field) {
+ if (/*s->mb_y << field_pic == s->mb_height &&*/ !s->first_field
&& !s->first_slice
) {
/* end of image */
s->current_picture_ptr->f.qscale_type = FF_QSCALE_TYPE_MPEG2;