# HG changeset patch # User michael # Date 1198063896 0 # Node ID 63fda6ba2173e01a2973ba857fb038d1fffdf998 # Parent 578a0c783eaed8f95ff913c7ef4090e788d9458a Remove dead code which disappeared with the last major version bump. diff -r 578a0c783eae -r 63fda6ba2173 avformat.h --- 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; diff -r 578a0c783eae -r 63fda6ba2173 avio.c --- 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; diff -r 578a0c783eae -r 63fda6ba2173 avio.h --- 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;