Commit a142816e authored by bellard's avatar bellard

more consistent naming


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@802 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 5c2a7a0e
#ifndef AVFORMAT_H #ifndef AVFORMAT_H
#define AVFORMAT_H #define AVFORMAT_H
#define LIBAV_VERSION_INT 0x000406 #define LIBAVFORMAT_VERSION_INT 0x000406
#define LIBAV_VERSION "0.4.6" #define LIBAVFORMAT_VERSION "0.4.6"
#define LIBAV_BUILD 4601 #define LIBAVFORMAT_BUILD 4601
#include "avcodec.h" #include "avcodec.h"
...@@ -232,9 +232,7 @@ AVOutputFormat *guess_format(const char *short_name, ...@@ -232,9 +232,7 @@ AVOutputFormat *guess_format(const char *short_name,
void av_hex_dump(UINT8 *buf, int size); void av_hex_dump(UINT8 *buf, int size);
void register_all(void); void av_register_all(void);
INT64 gettime(void);
typedef struct FifoBuffer { typedef struct FifoBuffer {
UINT8 *buffer; UINT8 *buffer;
...@@ -249,6 +247,7 @@ void fifo_write(FifoBuffer *f, UINT8 *buf, int size, UINT8 **wptr_ptr); ...@@ -249,6 +247,7 @@ void fifo_write(FifoBuffer *f, UINT8 *buf, int size, UINT8 **wptr_ptr);
/* media file input */ /* media file input */
AVInputFormat *av_find_input_format(const char *short_name); AVInputFormat *av_find_input_format(const char *short_name);
AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
AVInputFormat *fmt, AVInputFormat *fmt,
int buf_size, int buf_size,
...@@ -278,6 +277,8 @@ void dump_format(AVFormatContext *ic, ...@@ -278,6 +277,8 @@ void dump_format(AVFormatContext *ic,
int parse_image_size(int *width_ptr, int *height_ptr, const char *str); int parse_image_size(int *width_ptr, int *height_ptr, const char *str);
INT64 parse_date(const char *datestr, int duration); INT64 parse_date(const char *datestr, int duration);
INT64 av_gettime(void);
/* ffm specific for ffserver */ /* ffm specific for ffserver */
#define FFM_PACKET_SIZE 4096 #define FFM_PACKET_SIZE 4096
offset_t ffm_read_write_index(int fd); offset_t ffm_read_write_index(int fd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment