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
26811fd9
Commit
26811fd9
authored
Mar 23, 2016
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/mpegtsenc: Fix used service
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
50d017a2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
mpegtsenc.c
libavformat/mpegtsenc.c
+12
-0
version.h
libavformat/version.h
+1
-1
No files found.
libavformat/mpegtsenc.c
View file @
26811fd9
...
@@ -806,6 +806,7 @@ static int mpegts_init(AVFormatContext *s)
...
@@ -806,6 +806,7 @@ static int mpegts_init(AVFormatContext *s)
/* assign pids to each stream */
/* assign pids to each stream */
for
(
i
=
0
;
i
<
s
->
nb_streams
;
i
++
)
{
for
(
i
=
0
;
i
<
s
->
nb_streams
;
i
++
)
{
AVProgram
*
program
;
st
=
s
->
streams
[
i
];
st
=
s
->
streams
[
i
];
ts_st
=
av_mallocz
(
sizeof
(
MpegTSWriteStream
));
ts_st
=
av_mallocz
(
sizeof
(
MpegTSWriteStream
));
...
@@ -823,6 +824,17 @@ static int mpegts_init(AVFormatContext *s)
...
@@ -823,6 +824,17 @@ static int mpegts_init(AVFormatContext *s)
ret
=
AVERROR
(
ENOMEM
);
ret
=
AVERROR
(
ENOMEM
);
goto
fail
;
goto
fail
;
}
}
program
=
av_find_program_from_stream
(
s
,
NULL
,
i
);
if
(
program
)
{
for
(
j
=
0
;
j
<
ts
->
nb_services
;
j
++
)
{
if
(
ts
->
services
[
j
]
->
program
==
program
)
{
service
=
ts
->
services
[
j
];
break
;
}
}
}
ts_st
->
service
=
service
;
ts_st
->
service
=
service
;
/* MPEG pid values < 16 are reserved. Applications which set st->id in
/* MPEG pid values < 16 are reserved. Applications which set st->id in
* this range are assigned a calculated pid. */
* this range are assigned a calculated pid. */
...
...
libavformat/version.h
View file @
26811fd9
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 29
#define LIBAVFORMAT_VERSION_MINOR 29
#define LIBAVFORMAT_VERSION_MICRO 10
0
#define LIBAVFORMAT_VERSION_MICRO 10
1
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
LIBAVFORMAT_VERSION_MINOR, \
...
...
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