Browse Source

lavf: deprecate AVFormatParameters.mpeg2ts_raw.

It doesn't do anything except produce an error message when set.
tags/n0.8
Anton Khirnov 14 years ago
parent
commit
fb37d57347
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      libavformat/avformat.h
  2. +2
    -2
      libavformat/mpegts.c

+ 1
- 1
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


+ 2
- 2
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);


Loading…
Cancel
Save