summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-05-27 07:38:49 +0200
committerAnton Khirnov <anton@khirnov.net>2011-05-27 23:33:51 +0200
commitf91ccb1df6fe6d043bd88eabc916be1093b6677b (patch)
treebfa8651b6173553dd49647e8ff3b03ce877c1183
parent2a85f218680832bc8a22155c8d5225bdb9c10279 (diff)
lavf: deprecate AVFormatParameters.pix_fmt.
-rw-r--r--libavformat/avformat.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 849a85d1cc..27cd0f7763 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -233,9 +233,7 @@ typedef struct AVFormatParameters {
attribute_deprecated int channels;
attribute_deprecated int width;
attribute_deprecated int height;
-#endif
- enum PixelFormat pix_fmt;
-#if FF_API_FORMAT_PARAMETERS
+ attribute_deprecated enum PixelFormat pix_fmt;
attribute_deprecated int channel; /**< Used to select DV channel. */
attribute_deprecated const char *standard; /**< deprecated, use demuxer-specific options instead. */
attribute_deprecated unsigned int mpeg2ts_raw:1; /**< deprecated, use mpegtsraw demuxer */