[Ffmpeg-cvslog] r7674 - trunk/libavformat/mpegts.c[PATCH]

[Michel Bardiaux]

Diego Biurrun wrote:
> On Thu, Jan 25, 2007 at 11:28:16AM +0100, Michel Bardiaux wrote:
>> Diego Biurrun wrote:
>>> On Wed, Jan 24, 2007 at 02:17:34PM +0100, Michel Bardiaux wrote:
>>>> Michael Niedermayer wrote:
>>>>> On Wed, Jan 24, 2007 at 12:12:45PM +0100, Michel Bardiaux wrote:
>>>>>> michael wrote:
>>>>>>> Modified: trunk/libavformat/mpegts.c
>>>>>>>
>>>>>>> Log: "converts printf's to avlog's" patch by Daniel Kristjansson
>>>>>>> / danielk mrl.nyu edu another 1 year old patch forgoten by mans 
>>>>>>> trailing whitespace removial by me
>>>>>>>
>>>>>>> --- trunk/libavformat/mpegts.c	(original) +++
>>>>>>> trunk/libavformat/mpegts.c	Tue Jan 23 22:41:30 2007 @@ -162,7
>>>>>>> +162,7 @@ MpegTSSectionFilter *sec;
>>>>>>>
>>>>>>> #ifdef DEBUG_SI -    printf("Filter: pid=0x%x\n", pid); +
>>>>>>> av_log(NULL, AV_LOG_DEBUG, "Filter: pid=0x%x\n", pid); #endif
>>>>>> [snip]
>>>>>>
>>>>>> Why NULL? Could be ts->stream, or add an AVClass at the top of 
>>>>>> MpegTSContext. (I dont propose a patch because it would depend on
>>>>>> the choice made)
>>>>> it should be AVFormatContext of course instead of NULL, patch welcome
>>>>>
>>>> Here it is. Compiles of course (with DEBUG_SI defined), and passes 
>>>> regression (up to the point where it says "This test requires FFmpeg to 
>>>> be compiled with --enable-gpl") but I dont know how much that means, and 
>>>> I dont have MPEGTS files handy for a more targetted test.
>>> Recompile with --enable-gpl and rerun the regression tests.
>>>
>>> Diego
>> Just did, alas it does not go well:
>>
>> Waiting for feeds to startup...
>> Launch commandline: ../ffmpeg -loop_input -flags +bitexact -dct fastint 
>> -idct simple -y -f pgmyuv -i vsynth1/%02d.pgm 
>> http://127.0.0.1:9999/feed1.ffm
>> ffserver started.
>> [...]
>>
>> Being wholly unfamiliar with ffserver, I dont have a clue what to do...
> 
> Ignore the ffserver regression test, it's broken.  The test you need to
> pass is libavtest.  I'll look into printing some useful message for this
> test, it's confusing the heck out of people.

libavtest passes. Seems you can commit the patch.


-- 
Michel Bardiaux
R&D Director
T +32 [0] 2 790 29 41
F +32 [0] 2 790 29 02
E mailto:mbardiaux at mediaxim.be

Mediaxim NV/SA
Vorstlaan 191 Boulevard du Souverain
Brussel 1160 Bruxelles
http://www.mediaxim.com/