generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavf: deprecate AVFormatParameters.mpeg2ts_raw.

Browse Source 
It doesn't do anything except produce an error message when set.
This commit is contained in:
Anton Khirnov 2011-05-23 21:06:14 +02:00
parent 17a5556db5
commit fb37d57347
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avformat.h
View File

@ -235,8 +235,8 @@ typedef struct AVFormatParameters {
enum PixelFormat pix_fmt;
int channel; /**< Used to select DV channel. */
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
attribute_deprecated unsigned int mpeg2ts_raw:1; /**< deprecated, use mpegtsraw demuxer */
/**< deprecated, use mpegtsraw demuxer-specific options instead */
attribute_deprecated unsigned int mpeg2ts_compute_pcr:1;
#endif

4
libavformat/mpegts.c
View File

@ -1470,16 +1470,16 @@ static int mpegts_read_header(AVFormatContext *s,
int len;
int64_t pos;
if (ap) {
#if FF_API_FORMAT_PARAMETERS
if (ap) {
if (ap->mpeg2ts_compute_pcr)
ts->mpeg2ts_compute_pcr = ap->mpeg2ts_compute_pcr;
#endif
if(ap->mpeg2ts_raw){
av_log(s, AV_LOG_ERROR, "use mpegtsraw_demuxer!\n");
return -1;
}
}
#endif
/* read the first 1024 bytes to get packet size */
pos = avio_tell(pb);