aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-08-04 17:04:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-08-04 17:05:07 +0200
commit9e63720b4b1241a9b17622b789c47cff6e180a4f (patch)
tree5908a6dec5dac628951f06b2546fb5101183ed26
parent31fe5d9825a050ca319ab9ddbe502d84ac3a576e (diff)
downloadffmpeg-9e63720b4b1241a9b17622b789c47cff6e180a4f.tar.gz
mpegvideo.h: remove the 1 line difference to qatar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mpegvideo.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index a25e8aa4c7..44a0dd671d 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -211,7 +211,6 @@ typedef struct MpegEncContext {
/* the following codec id fields are deprecated in favor of codec_id */
int h263_plus; ///< h263 plus headers
- int h263_msmpeg4; ///< generate MSMPEG4 compatible stream (deprecated, use msmpeg4_version instead)
int h263_flv; ///< use flv h263 header
enum CodecID codec_id; /* see CODEC_ID_xxx */