I believe this fixes 0.3.2-cvs failures; it's 0.3.1-backwards-compatible (well, compile-wise) too
Original commit message from CVS: I believe this fixes 0.3.2-cvs failures; it's 0.3.1-backwards-compatible (well, compile-wise) too
This commit is contained in:
parent
499ae15a75
commit
625c0096f2
@ -32,6 +32,8 @@
|
|||||||
*/
|
*/
|
||||||
#ifndef MPEG2_RELEASE
|
#ifndef MPEG2_RELEASE
|
||||||
typedef picture_t mpeg2_picture_t;
|
typedef picture_t mpeg2_picture_t;
|
||||||
|
typedef gint mpeg2_state_t;
|
||||||
|
#define STATE_BUFFER -1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
GST_DEBUG_CATEGORY_EXTERN (GST_CAT_SEEK);
|
GST_DEBUG_CATEGORY_EXTERN (GST_CAT_SEEK);
|
||||||
@ -418,7 +420,7 @@ update_streaminfo (GstMpeg2dec *mpeg2dec)
|
|||||||
static void
|
static void
|
||||||
gst_mpeg2dec_flush_decoder (GstMpeg2dec *mpeg2dec)
|
gst_mpeg2dec_flush_decoder (GstMpeg2dec *mpeg2dec)
|
||||||
{
|
{
|
||||||
gint state;
|
mpeg2_state_t state;
|
||||||
|
|
||||||
if (mpeg2dec->decoder) {
|
if (mpeg2dec->decoder) {
|
||||||
const mpeg2_info_t *info = mpeg2_info (mpeg2dec->decoder);
|
const mpeg2_info_t *info = mpeg2_info (mpeg2dec->decoder);
|
||||||
@ -431,7 +433,7 @@ gst_mpeg2dec_flush_decoder (GstMpeg2dec *mpeg2dec)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
while (state != -1);
|
while (state != STATE_BUFFER);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -443,7 +445,7 @@ gst_mpeg2dec_chain (GstPad *pad, GstBuffer *buf)
|
|||||||
guint8 *data, *end;
|
guint8 *data, *end;
|
||||||
gint64 pts;
|
gint64 pts;
|
||||||
const mpeg2_info_t *info;
|
const mpeg2_info_t *info;
|
||||||
gint state;
|
mpeg2_state_t state;
|
||||||
gboolean done = FALSE;
|
gboolean done = FALSE;
|
||||||
|
|
||||||
if (GST_IS_EVENT (buf)) {
|
if (GST_IS_EVENT (buf)) {
|
||||||
@ -656,7 +658,7 @@ gst_mpeg2dec_chain (GstPad *pad, GstBuffer *buf)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* need more data */
|
/* need more data */
|
||||||
case -1:
|
case STATE_BUFFER:
|
||||||
done = TRUE;
|
done = TRUE;
|
||||||
break;
|
break;
|
||||||
/* error */
|
/* error */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user