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
fb37d573
Commit
fb37d573
authored
May 23, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: deprecate AVFormatParameters.mpeg2ts_raw.
It doesn't do anything except produce an error message when set.
parent
17a5556d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
avformat.h
libavformat/avformat.h
+1
-1
mpegts.c
libavformat/mpegts.c
+2
-2
No files found.
libavformat/avformat.h
View file @
fb37d573
...
@@ -235,8 +235,8 @@ typedef struct AVFormatParameters {
...
@@ -235,8 +235,8 @@ typedef struct AVFormatParameters {
enum
PixelFormat
pix_fmt
;
enum
PixelFormat
pix_fmt
;
int
channel
;
/**< Used to select DV channel. */
int
channel
;
/**< Used to select DV channel. */
const
char
*
standard
;
/**< TV standard, NTSC, PAL, SECAM */
const
char
*
standard
;
/**< TV standard, NTSC, PAL, SECAM */
unsigned
int
mpeg2ts_raw
:
1
;
/**< Force raw MPEG-2 transport stream output, if possible. */
#if FF_API_FORMAT_PARAMETERS
#if FF_API_FORMAT_PARAMETERS
attribute_deprecated
unsigned
int
mpeg2ts_raw
:
1
;
/**< deprecated, use mpegtsraw demuxer */
/**< deprecated, use mpegtsraw demuxer-specific options instead */
/**< deprecated, use mpegtsraw demuxer-specific options instead */
attribute_deprecated
unsigned
int
mpeg2ts_compute_pcr
:
1
;
attribute_deprecated
unsigned
int
mpeg2ts_compute_pcr
:
1
;
#endif
#endif
...
...
libavformat/mpegts.c
View file @
fb37d573
...
@@ -1470,16 +1470,16 @@ static int mpegts_read_header(AVFormatContext *s,
...
@@ -1470,16 +1470,16 @@ static int mpegts_read_header(AVFormatContext *s,
int
len
;
int
len
;
int64_t
pos
;
int64_t
pos
;
if
(
ap
)
{
#if FF_API_FORMAT_PARAMETERS
#if FF_API_FORMAT_PARAMETERS
if
(
ap
)
{
if
(
ap
->
mpeg2ts_compute_pcr
)
if
(
ap
->
mpeg2ts_compute_pcr
)
ts
->
mpeg2ts_compute_pcr
=
ap
->
mpeg2ts_compute_pcr
;
ts
->
mpeg2ts_compute_pcr
=
ap
->
mpeg2ts_compute_pcr
;
#endif
if
(
ap
->
mpeg2ts_raw
){
if
(
ap
->
mpeg2ts_raw
){
av_log
(
s
,
AV_LOG_ERROR
,
"use mpegtsraw_demuxer!
\n
"
);
av_log
(
s
,
AV_LOG_ERROR
,
"use mpegtsraw_demuxer!
\n
"
);
return
-
1
;
return
-
1
;
}
}
}
}
#endif
/* read the first 1024 bytes to get packet size */
/* read the first 1024 bytes to get packet size */
pos
=
avio_tell
(
pb
);
pos
=
avio_tell
(
pb
);
...
...
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