diff options
author | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2006-12-13 00:06:33 +0000 |
---|---|---|
committer | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2006-12-13 00:06:33 +0000 |
commit | 83c547a4a14976ea2a5e51273a2ef372aca71044 (patch) | |
tree | 01498da230ffdef2564c01e89ae8f520b7c82c48 /ffmpeg.c | |
parent | 77e5024c1cae62996ada908750b5155db03d06bb (diff) | |
download | ffmpeg-streaming-83c547a4a14976ea2a5e51273a2ef372aca71044.zip ffmpeg-streaming-83c547a4a14976ea2a5e51273a2ef372aca71044.tar.gz |
revert broken commit of x11 device demuxer patch
Originally committed as revision 7301 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -3234,10 +3234,6 @@ static void prepare_grab(void) if (has_video) { AVInputFormat *fmt1; -#warning FIXME: find a better interface - if(!strncmp(video_device,"x11:",4)) { - video_grab_format="x11grab"; - } fmt1 = av_find_input_format(video_grab_format); vp->device = video_device; vp->channel = video_channel; |