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
271a0004
Commit
271a0004
authored
Nov 27, 2018
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/rawdec: Do not mark streams from raw subtitle demuxers as data streams.
Improves "ffmpeg -i" output for raw dvbsub files.
parent
68f289da
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
2 deletions
+15
-2
rawdec.c
libavformat/rawdec.c
+11
-0
rawdec.h
libavformat/rawdec.h
+3
-1
version.h
libavformat/version.h
+1
-1
No files found.
libavformat/rawdec.c
View file @
271a0004
...
@@ -91,6 +91,17 @@ fail:
...
@@ -91,6 +91,17 @@ fail:
return
ret
;
return
ret
;
}
}
int
ff_raw_subtitle_read_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
st
->
codecpar
->
codec_type
=
AVMEDIA_TYPE_SUBTITLE
;
st
->
codecpar
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
st
->
start_time
=
0
;
return
0
;
}
int
ff_raw_data_read_header
(
AVFormatContext
*
s
)
int
ff_raw_data_read_header
(
AVFormatContext
*
s
)
{
{
AVStream
*
st
=
avformat_new_stream
(
s
,
NULL
);
AVStream
*
st
=
avformat_new_stream
(
s
,
NULL
);
...
...
libavformat/rawdec.h
View file @
271a0004
...
@@ -41,6 +41,8 @@ int ff_raw_audio_read_header(AVFormatContext *s);
...
@@ -41,6 +41,8 @@ int ff_raw_audio_read_header(AVFormatContext *s);
int
ff_raw_video_read_header
(
AVFormatContext
*
s
);
int
ff_raw_video_read_header
(
AVFormatContext
*
s
);
int
ff_raw_subtitle_read_header
(
AVFormatContext
*
s
);
int
ff_raw_data_read_header
(
AVFormatContext
*
s
);
int
ff_raw_data_read_header
(
AVFormatContext
*
s
);
#define FF_RAWVIDEO_DEMUXER_CLASS(name)\
#define FF_RAWVIDEO_DEMUXER_CLASS(name)\
...
@@ -83,7 +85,7 @@ AVInputFormat ff_ ## shortname ## _demuxer = {\
...
@@ -83,7 +85,7 @@ AVInputFormat ff_ ## shortname ## _demuxer = {\
.name = #shortname,\
.name = #shortname,\
.long_name = NULL_IF_CONFIG_SMALL(longname),\
.long_name = NULL_IF_CONFIG_SMALL(longname),\
.read_probe = probe,\
.read_probe = probe,\
.read_header = ff_raw_
data
_read_header,\
.read_header = ff_raw_
subtitle
_read_header,\
.read_packet = ff_raw_read_partial_packet,\
.read_packet = ff_raw_read_partial_packet,\
.extensions = ext,\
.extensions = ext,\
.flags = flag,\
.flags = flag,\
...
...
libavformat/version.h
View file @
271a0004
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 58
#define LIBAVFORMAT_VERSION_MAJOR 58
#define LIBAVFORMAT_VERSION_MINOR 23
#define LIBAVFORMAT_VERSION_MINOR 23
#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