From fb37d573473d615cc323635fa5bc58fe16d14ee4 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 23 May 2011 21:06:14 +0200
Subject: [PATCH] lavf: deprecate AVFormatParameters.mpeg2ts_raw.

It doesn't do anything except produce an error message when set.
---
 libavformat/avformat.h | 2 +-
 libavformat/mpegts.c   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 7e8cd80aee..35e6c15f81 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -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
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 20528c5bc4..7c0f3818d5 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -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);