changeset 2834:63fda6ba2173 libavformat

Remove dead code which disappeared with the last major version bump.
author michael
date Wed, 19 Dec 2007 11:31:36 +0000
parents 578a0c783eae
children b158768c5352
files avformat.h avio.c avio.h
diffstat 3 files changed, 0 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/avformat.h	Wed Dec 19 10:58:54 2007 +0000
+++ b/avformat.h	Wed Dec 19 11:31:36 2007 +0000
@@ -136,9 +136,6 @@
     int height;
     enum PixelFormat pix_fmt;
     int channel; /**< used to select dv channel */
-#if LIBAVFORMAT_VERSION_INT < (52<<16)
-    const char *device; /**< video, audio or DV device */
-#endif
     const char *standard; /**< tv standard, NTSC, PAL, SECAM */
     int mpeg2ts_raw:1;  /**< force raw MPEG2 transport stream output, if possible */
     int mpeg2ts_compute_pcr:1; /**< compute exact PCR for each transport
@@ -289,9 +286,6 @@
 
     /* internal data used in av_find_stream_info() */
     int64_t first_dts;
-#if LIBAVFORMAT_VERSION_INT < (52<<16)
-    int codec_info_nb_frames;
-#endif
     /** encoding: PTS generation when outputing stream */
     struct AVFrac pts;
 
--- a/avio.c	Wed Dec 19 10:58:54 2007 +0000
+++ b/avio.c	Wed Dec 19 11:31:36 2007 +0000
@@ -82,9 +82,7 @@
         err = AVERROR(ENOMEM);
         goto fail;
     }
-#if LIBAVFORMAT_VERSION_INT >= (52<<16)
     uc->filename = (char *) &uc[1];
-#endif
     strcpy(uc->filename, filename);
     uc->prot = up;
     uc->flags = flags;
--- a/avio.h	Wed Dec 19 10:58:54 2007 +0000
+++ b/avio.h	Wed Dec 19 11:31:36 2007 +0000
@@ -35,11 +35,7 @@
     int is_streamed;  /**< true if streamed (no seek possible), default = false */
     int max_packet_size;  /**< if non zero, the stream is packetized with this max packet size */
     void *priv_data;
-#if LIBAVFORMAT_VERSION_INT >= (52<<16)
     char *filename; /**< specified filename */
-#else
-    char filename[1]; /**< specified filename */
-#endif
 };
 
 typedef struct URLContext URLContext;