h264parse: fixup merge
This commit is contained in:
parent
cf942f4e1f
commit
67a8e53aef
@ -654,7 +654,7 @@ gst_h264_parse_check_valid_frame (GstBaseParse * parse,
|
|||||||
GstMapInfo map;
|
GstMapInfo map;
|
||||||
guint8 *data;
|
guint8 *data;
|
||||||
gsize size;
|
gsize size;
|
||||||
guint current_off = 0;
|
gint current_off = 0;
|
||||||
gboolean drain, nonext;
|
gboolean drain, nonext;
|
||||||
GstH264NalParser *nalparser = h264parse->nalparser;
|
GstH264NalParser *nalparser = h264parse->nalparser;
|
||||||
GstH264NalUnit nalu;
|
GstH264NalUnit nalu;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user