[FFmpeg-cvslog] r11077 - in trunk: Changelog Makefile configure ffmpeg.c ffplay.c libavdevice libavdevice/Makefile libavdevice/alldevices.c libavdevice/audio.c libavdevice/avdevice.h libavdevice/beosaudio.cpp libavdevice/bktr.c libavdevice/dv1394.c libavdevice/dv1394.h libavdevice/libdc1394.c libavdevice/v4l.c libavdevice/v4l2.c libavdevice/x11grab.c libavformat/Makefile libavformat/allformats.c libavformat/audio.c libavformat/beosaudio.cpp libavformat/bktr.c libavformat/dv1394.c libavformat/dv1394.h libavformat/libdc1394.c libavformat/v4l.c libavformat/v4l2.c libavformat/x11grab.c

[Luca Abeni]

Hi Michael,

Michael Niedermayer wrote:
[...]
>> -    /* (de)muxers */
>> -    REGISTER_MUXDEMUX (AUDIO_BEOS, audio_beos);
>> -    REGISTER_DEMUXER  (BKTR, bktr);
>> -    REGISTER_DEMUXER  (DV1394, dv1394);
>> -    REGISTER_MUXDEMUX (OSS, oss);
>> -    REGISTER_DEMUXER  (V4L2, v4l2);
>> -    REGISTER_DEMUXER  (V4L, v4l);
>> -    REGISTER_DEMUXER  (X11_GRAB_DEVICE, x11_grab_device);
>> +    /* devices */
>> +    REGISTER_INOUTDEV (AUDIO_BEOS, audio_beos);
>> +    REGISTER_INDEV    (BKTR, bktr);
>> +    REGISTER_INDEV    (DV1394, dv1394);
>> +    REGISTER_INOUTDEV (OSS, oss);
>> +    REGISTER_INDEV    (V4L2, v4l2);
>> +    REGISTER_INDEV    (V4L, v4l);
>> +    REGISTER_INDEV    (X11_GRAB_DEVICE, x11_grab_device);
> 
> seems my request of seperating renamings has not been clear enough

Sorry, I misunderstood. I was under the impression that you was
talking about the renaming I introduced in the last patches (and
which I did not commit).


> but thats no problem, its just more work for you
> please revert the change to this file with svn cp from the previous revission
> and redo without the rename

Ok, I am going to fix this asap.


			Sorry for the mistake,
				Luca