Remove dead code which disappeared with the last major version bump.

Originally committed as revision 11268 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index b7554d4..b9e83bf 100644 (file)
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -136,9 +136,6 @@ typedef struct AVFormatParameters {
     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 @@ typedef struct AVStream {
 
     /* 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;
 

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 3447889..6a08a5e 100644 (file)
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -82,9 +82,7 @@ int url_open(URLContext **puc, const char *filename, int flags)
         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;

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 95d4672..d3fa10f 100644 (file)
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -35,11 +35,7 @@ struct URLContext {
     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;