[Ffmpeg-devel] [PATCH] enable/disable (de)muxers

[Harikrishnan Varma]

M?ns Rullg?rd wrote:
> Diego Biurrun <diego at biurrun.de> writes:
> 
>> On Mon, Jul 10, 2006 at 12:22:20AM +0100, M?ns Rullg?rd wrote:
>>> Diego Biurrun <diego at biurrun.de> writes:
>>> 
>>>> On Sun, Jul 09, 2006 at 11:35:21PM +0100, M?ns Rullg?rd wrote:
>>>>> Diego Biurrun <diego at biurrun.de> writes:
>>>>> 
>>>>>> On Sun, Jul 09, 2006 at 11:10:40PM +0100, M?ns Rullg?rd wrote:
>>>>>>> M?ns Rullg?rd <mru at inprovide.com> writes:
>>>>>>> 
>>>>>>>> OK, here's the initial patch for review.  I'd like to have
>>>>>>>> someone else cast an eye on it before I commit, just in case I
>>>>>>>> did something really silly.
>>>>>>> 
>>>>>>> Hmm... already a flaw found.  Updated patch attached.
>>>>>>> 
>>>>>>> --- ffplay.c	(revision 5695)
>>>>>>> +++ ffplay.c	(working copy)
>>>>>>> @@ -1790,7 +1790,7 @@
>>>>>>>  #ifdef CONFIG_NETWORK
>>>>>>> -    use_play = (ic->iformat == &rtsp_demux);
>>>>>>> +    use_play = (ic->iformat == &rtsp_demuxer);
>>>>>>>  #else
>>>>>>> @@ -1884,7 +1884,7 @@
>>>>>>>          }
>>>>>>> -        if (is->paused && ic->iformat == &rtsp_demux) {
>>>>>>> +        if (is->paused && ic->iformat == &rtsp_demuxer) {
>>>>>>>              /* wait 10 ms to avoid trying to get another
>>>>>>> packet */ 
>>>>>> 
>>>>>> Here and below I'd prefer to see all those (semi-cosmetic)
>>>>>> renaming operations done in a separate patch/commit, this will
>>>>>> shrink this patch considerably and make it easier to review.
>>>>> 
>>>>> I suppose I could first do all the renames, keeping the structure.
>>>>> Such a patch would have the same size as this one (more or less).
>>>>> That would then be followed by another patch to remove the
>>>>> 'static' in the definitions, making for another patch of about
>>>>> the same size. 
>>>> 
>>>> I was expecting it to be considerably smaller, after a closer
>>>> reading of the patch I may be wrong and the saving might not be so
>>>> big after all.. 
>>> 
>>> Oh well, here it is.  Just the renamings of AVInput/OutputFormat
>>> vars. 
>> 
>> Looks good and was easy to review, commit.
> 
> And here goes part 2.

Index: libavformat/ogg.c
===================================================================
--- libavformat/ogg.c	(revision 5704)
+++ libavformat/ogg.c	(working copy)
@@ -137,7 +137,7 @@
 }
 
 
-static AVOutputFormat ogg_muxer = {
+AVOutputFormat ogg_muxer = {
     "ogg",
     "Ogg Vorbis",
     "audio/x-vorbis",
@@ -254,7 +254,7 @@
 }
 
 
-static AVInputFormat ogg_demuxer = {
+static AVInputFormat ogg_iformat = {
     "ogg",
     "Ogg Vorbis",
     sizeof(OggContext),
@@ -265,11 +265,3 @@
     .extensions = "ogg",
 } ;
 #endif

Shouldn't it be ogg_demuxer instead of ogg_iformat (changed in revision 5697)?

Index: libavformat/aiff.c
===================================================================
--- libavformat/aiff.c	(revision 5704)
+++ libavformat/aiff.c	(working copy)
@@ -428,8 +428,8 @@
     return pcm_read_seek(s, stream_index, timestamp, flags);
 }
 
-
-static AVInputFormat aiff_demuxer = {
+#ifdef CONFIG_AIFF_DEMUXER
+AVInputFormat aiff_demuxer = {
     "aiff",
     "Audio IFF",
     0,
@@ -439,9 +439,10 @@
     aiff_read_close,
     aiff_read_seek,
 };
+#endif
 
-#ifdef CONFIG_MUXERS
-static AVOutputFormat aiff_muxer = {
+#ifdef CONFIG_AIFF_DEMUXER
+AVOutputFormat aiff_muxer = {
     "aiff",
     "Audio IFF",
     "audio/aiff",
@@ -453,14 +454,4 @@
     aiff_write_packet,
     aiff_write_trailer,
 };

Shouldn't the latter be CONFIG_AIFF_MUXER instead of CONFIG_AIFF_DEMUXER?

Regards,
 Harikrishnan