summaryrefslogtreecommitdiff
path: root/libav/avformat.h
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2001-09-24 23:25:28 +0000
committerFabrice Bellard <fabrice@bellard.org>2001-09-24 23:25:28 +0000
commit96baaa6affc11ebd71b8f84c11086c92e1c7248b (patch)
treed9709a4760a43f903b775c48856892876ff56d24 /libav/avformat.h
parent4b44538ce6be7123a996ab2d698fe077c6c0e067 (diff)
changed av_open_input_file() prototype
Originally committed as revision 146 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libav/avformat.h')
-rw-r--r--libav/avformat.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/libav/avformat.h b/libav/avformat.h
index 48a8f3f590..630c5af95b 100644
--- a/libav/avformat.h
+++ b/libav/avformat.h
@@ -180,7 +180,10 @@ int fifo_size(FifoBuffer *f, UINT8 *rptr);
int fifo_read(FifoBuffer *f, UINT8 *buf, int buf_size, UINT8 **rptr_ptr);
void fifo_write(FifoBuffer *f, UINT8 *buf, int size, UINT8 **wptr_ptr);
-AVFormatContext *av_open_input_file(const char *filename, int buf_size);
+AVFormatContext *av_open_input_file(const char *filename,
+ const char *format_name,
+ int buf_size,
+ AVFormatParameters *ap);
int av_read_packet(AVFormatContext *s, AVPacket *pkt);
void av_close_input_file(AVFormatContext *s);
@@ -204,3 +207,10 @@ int find_info_tag(char *arg, int arg_size, const char *tag1, const char *info);
int get_frame_filename(char *buf, int buf_size,
const char *path, int number);
+
+/* grab/output specific */
+extern AVFormat video_grab_device_format;
+extern AVFormat audio_device_format;
+
+extern const char *v4l_device;
+extern const char *audio_device;