Commit 86fd51fb authored by Fabrice Bellard's avatar Fabrice Bellard
Browse files

video_device fixes

Originally committed as revision 1497 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2a6874fd
......@@ -21,8 +21,6 @@
/* If you do not call this function, then you can select exactly which
formats you want to support */
char *video_device = "none";
/**
* Initialize libavcodec and register all the codecs and formats.
*/
......
......@@ -379,7 +379,11 @@ int filename_number_test(const char *filename);
int video_grab_init(void);
int audio_init(void);
extern const char *v4l_device;
/* DV1394 */
int dv1394_init(void);
extern int dv1394_channel;
extern const char *video_device;
extern const char *audio_device;
#ifdef HAVE_AV_CONFIG_H
......
......@@ -41,6 +41,8 @@ AVInputFormat *first_iformat;
AVOutputFormat *first_oformat;
AVImageFormat *first_image_format;
const char *video_device = "none";
void av_register_input_format(AVInputFormat *format)
{
AVInputFormat **p;
......
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