Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
5532ee6d
Commit
5532ee6d
authored
Sep 20, 2013
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rtmp: Unbreak get_packet
Commit
5626f994
broke it.
parent
a9d50bb5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
rtmpproto.c
libavformat/rtmpproto.c
+9
-8
No files found.
libavformat/rtmpproto.c
View file @
5532ee6d
...
@@ -2186,6 +2186,7 @@ static int get_packet(URLContext *s, int for_header)
...
@@ -2186,6 +2186,7 @@ static int get_packet(URLContext *s, int for_header)
{
{
RTMPContext
*
rt
=
s
->
priv_data
;
RTMPContext
*
rt
=
s
->
priv_data
;
int
ret
;
int
ret
;
uint8_t
*
p
;
const
uint8_t
*
next
;
const
uint8_t
*
next
;
uint32_t
size
;
uint32_t
size
;
uint32_t
ts
,
cts
,
pts
=
0
;
uint32_t
ts
,
cts
,
pts
=
0
;
...
@@ -2257,13 +2258,14 @@ static int get_packet(URLContext *s, int for_header)
...
@@ -2257,13 +2258,14 @@ static int get_packet(URLContext *s, int for_header)
rt
->
flv_size
=
rpkt
.
size
+
15
;
rt
->
flv_size
=
rpkt
.
size
+
15
;
if
((
err
=
av_reallocp
(
&
rt
->
flv_data
,
rt
->
flv_size
))
<
0
)
if
((
err
=
av_reallocp
(
&
rt
->
flv_data
,
rt
->
flv_size
))
<
0
)
return
err
;
return
err
;
bytestream_put_byte
(
&
rt
->
flv_data
,
rpkt
.
type
);
p
=
rt
->
flv_data
;
bytestream_put_be24
(
&
rt
->
flv_data
,
rpkt
.
size
);
bytestream_put_byte
(
&
p
,
rpkt
.
type
);
bytestream_put_be24
(
&
rt
->
flv_data
,
ts
);
bytestream_put_be24
(
&
p
,
rpkt
.
size
);
bytestream_put_byte
(
&
rt
->
flv_data
,
ts
>>
24
);
bytestream_put_be24
(
&
p
,
ts
);
bytestream_put_be24
(
&
rt
->
flv_data
,
0
);
bytestream_put_byte
(
&
p
,
ts
>>
24
);
bytestream_put_buffer
(
&
rt
->
flv_data
,
rpkt
.
data
,
rpkt
.
size
);
bytestream_put_be24
(
&
p
,
0
);
bytestream_put_be32
(
&
rt
->
flv_data
,
0
);
bytestream_put_buffer
(
&
p
,
rpkt
.
data
,
rpkt
.
size
);
bytestream_put_be32
(
&
p
,
0
);
ff_rtmp_packet_destroy
(
&
rpkt
);
ff_rtmp_packet_destroy
(
&
rpkt
);
return
0
;
return
0
;
}
else
if
(
rpkt
.
type
==
RTMP_PT_NOTIFY
)
{
}
else
if
(
rpkt
.
type
==
RTMP_PT_NOTIFY
)
{
...
@@ -2276,7 +2278,6 @@ static int get_packet(URLContext *s, int for_header)
...
@@ -2276,7 +2278,6 @@ static int get_packet(URLContext *s, int for_header)
return
0
;
return
0
;
}
else
if
(
rpkt
.
type
==
RTMP_PT_METADATA
)
{
}
else
if
(
rpkt
.
type
==
RTMP_PT_METADATA
)
{
int
err
;
int
err
;
uint8_t
*
p
;
// we got raw FLV data, make it available for FLV demuxer
// we got raw FLV data, make it available for FLV demuxer
rt
->
flv_off
=
0
;
rt
->
flv_off
=
0
;
rt
->
flv_size
=
rpkt
.
size
;
rt
->
flv_size
=
rpkt
.
size
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment