[FFmpeg-cvslog] r19173 - trunk/libavformat/adtsenc.c

[Alex Converse]

On Mon, Jun 29, 2009 at 3:43 PM, Diego Biurrun<diego at biurrun.de> wrote:
> On Mon, Jun 29, 2009 at 03:29:42PM -0400, Alex Converse wrote:
>> On Mon, Jun 29, 2009 at 3:18 PM, Ronald S. Bultje<rsbultje at gmail.com> wrote:
>> >
>> > 2009/6/12 M?ns Rullg?rd <mans at mansr.com>:
>> >> Alex Converse <alex.converse at gmail.com> writes:
>> >>> 2009/6/12 M?ns Rullg?rd <mans at mansr.com>:
>> >>>> alexc <subversion at mplayerhq.hu> writes:
>> >>>>> Author: alexc
>> >>>>> Date: Fri Jun 12 21:49:46 2009
>> >>>>> New Revision: 19173
>> >>>>>
>> >>>>> Log:
>> >>>>> Do not include libavcodec/internal.h in the ADTS muxer.
>> >>>>>
>> >>>>> --- trunk/libavformat/adtsenc.c ? ? ? Fri Jun 12 19:39:56 2009 ? ? ? ?(r19172)
>> >>>>> +++ trunk/libavformat/adtsenc.c ? ? ? Fri Jun 12 21:49:46 2009 ? ? ? ?(r19173)
>> >>>>> @@ -22,7 +22,6 @@
>> >>>>>
>> >>>>> ?#include "libavcodec/get_bits.h"
>> >>>>> ?#include "libavcodec/put_bits.h"
>> >>>>> -#include "libavcodec/internal.h"
>> >>>>> ?#include "libavcodec/mpeg4audio.h"
>> >>>>> ?#include "avformat.h"
>> >>>>>
>> >>>>> @@ -64,7 +63,7 @@ static int decode_extradata(AVFormatCont
>> >>>>> ? ? ? ? ?return -1;
>> >>>>> ? ? ?}
>> >>>>> ? ? ?if (get_bits(&gb, 1)) {
>> >>>>> - ? ? ? ?ff_log_missing_feature(s, "Signaled SBR or PS", 0);
>> >>>>> + ? ? ? ?av_log(s, AV_LOG_ERROR, "Signaled SBR or PS is not supported\n");
>> >>>>
>> >>>> Why did you do that?
>> >>>
>> >>> libavformat lacks ff_log_missing_feature
>> >>
>> >> Why can't it call the lavc one? ?It already depends on lavc.
>> >
>> > Can we revert the above patch now? Alex?
>>
>> If Diego says its ok. He's the one that told me to change it.
>
> It is.
>

Ok.

Ronald,

Do you want a straight revert (which will temporarily break the build
and break git-bisect) or do you want a combined revert and migration
to av_log_missing_feature?

--Alex