Originally committed as revision 11268 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -136,9 +136,6 @@ typedef struct AVFormatParameters { | |||||
int height; | int height; | ||||
enum PixelFormat pix_fmt; | enum PixelFormat pix_fmt; | ||||
int channel; /**< used to select dv channel */ | 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 */ | const char *standard; /**< tv standard, NTSC, PAL, SECAM */ | ||||
int mpeg2ts_raw:1; /**< force raw MPEG2 transport stream output, if possible */ | int mpeg2ts_raw:1; /**< force raw MPEG2 transport stream output, if possible */ | ||||
int mpeg2ts_compute_pcr:1; /**< compute exact PCR for each transport | 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() */ | /* internal data used in av_find_stream_info() */ | ||||
int64_t first_dts; | int64_t first_dts; | ||||
#if LIBAVFORMAT_VERSION_INT < (52<<16) | |||||
int codec_info_nb_frames; | |||||
#endif | |||||
/** encoding: PTS generation when outputing stream */ | /** encoding: PTS generation when outputing stream */ | ||||
struct AVFrac pts; | struct AVFrac pts; | ||||
@@ -82,9 +82,7 @@ int url_open(URLContext **puc, const char *filename, int flags) | |||||
err = AVERROR(ENOMEM); | err = AVERROR(ENOMEM); | ||||
goto fail; | goto fail; | ||||
} | } | ||||
#if LIBAVFORMAT_VERSION_INT >= (52<<16) | |||||
uc->filename = (char *) &uc[1]; | uc->filename = (char *) &uc[1]; | ||||
#endif | |||||
strcpy(uc->filename, filename); | strcpy(uc->filename, filename); | ||||
uc->prot = up; | uc->prot = up; | ||||
uc->flags = flags; | uc->flags = flags; | ||||
@@ -35,11 +35,7 @@ struct URLContext { | |||||
int is_streamed; /**< true if streamed (no seek possible), default = false */ | 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 */ | int max_packet_size; /**< if non zero, the stream is packetized with this max packet size */ | ||||
void *priv_data; | void *priv_data; | ||||
#if LIBAVFORMAT_VERSION_INT >= (52<<16) | |||||
char *filename; /**< specified filename */ | char *filename; /**< specified filename */ | ||||
#else | |||||
char filename[1]; /**< specified filename */ | |||||
#endif | |||||
}; | }; | ||||
typedef struct URLContext URLContext; | typedef struct URLContext URLContext; | ||||