comparison grab.c @ 1982:1805da944f22 libavformat

There were two files, libavformat/grab.c and libavformat/grab_bktr.c declaring the video_grab_device_demuxer AVInputFormat. Use two different names for the AVInputFormats to reduce confusion and remove ugliness from the Makefile.
author diego
date Tue, 03 Apr 2007 21:09:36 +0000
parents 62792a60f740
children fa4066708500
comparison
equal deleted inserted replaced
1981:b7016078f7c7 1982:1805da944f22
373 373
374 close(s->fd); 374 close(s->fd);
375 return 0; 375 return 0;
376 } 376 }
377 377
378 AVInputFormat video_grab_device_demuxer = { 378 AVInputFormat video_grab_v4l_demuxer = {
379 "video4linux", 379 "video4linux",
380 "video grab", 380 "video grab",
381 sizeof(VideoData), 381 sizeof(VideoData),
382 NULL, 382 NULL,
383 grab_read_header, 383 grab_read_header,