[FFmpeg-cvslog] r19742 - trunk/libavutil/internal.h

[Ramiro Polla]

On Fri, Sep 4, 2009 at 4:01 PM, Michael Niedermayer<michaelni at gmx.at> wrote:
> On Fri, Sep 04, 2009 at 02:06:20PM -0300, Ramiro Polla wrote:
>> On Fri, Sep 4, 2009 at 1:51 PM, Diego Biurrun<diego at biurrun.de> wrote:
>> > On Fri, Sep 04, 2009 at 01:49:49PM -0300, Ramiro Polla wrote:
>> >> On Thu, Sep 3, 2009 at 1:12 PM, Ramiro Polla<ramiro.polla at gmail.com> wrote:
>> >> > On Thu, Sep 3, 2009 at 12:33 PM, Benoit Fouet<benoit.fouet at free.fr> wrote:
>> >> >> On 2009-09-03 17:27, Ramiro Polla wrote:
>> >> > [...]
>> >> >>> --- a/libavutil/internal.h
>> >> >>> +++ b/libavutil/internal.h
>> >> >>> @@ -249,21 +249,21 @@ if ((y) < (x)) {\
>> >> >>>
>> >> >>> -#define CHECKED_ALLOC(p, size)\
>> >> >>> +#define FF_ALLOC_OR_GOTO(ctx, p, size, label)\
>> >> >>> ?{\
>> >> >>> ? ? ?p = av_malloc(size);\
>> >> >>> ? ? ?if (p == NULL && (size) != 0) {\
>> >> >>> - ? ? ? ?av_log(NULL, AV_LOG_ERROR, "Cannot allocate memory.");\
>> >> >>> - ? ? ? ?goto fail;\
>> >> >>> + ? ? ? ?av_log(ctx, AV_LOG_ERROR, "Cannot allocate memory.");\
>> >> >>> + ? ? ? ?goto label;\
>> >> >>>
>> >> >>
>> >> >> not related to this change, but doesn't this also miss a '\n' ?
>> >> >
>> >> > Yes, it does. Ok to just add it?
>> >>
>> >> ...
>> >>
>> >> Trivial patch attached.
>> >
>> >> --- libavutil/internal.h ? ? ?(revision 19757)
>> >> +++ libavutil/internal.h ? ? ?(working copy)
>> >> @@ -253,7 +253,7 @@
>> >> ? ? ?p = av_malloc(size);\
>> >> ? ? ?if (p == NULL && (size) != 0) {\
>> >> - ? ? ? ?av_log(NULL, AV_LOG_ERROR, "Cannot allocate memory.");\
>> >> + ? ? ? ?av_log(NULL, AV_LOG_ERROR, "Cannot allocate memory.\n");\
>> >
>> > I don't think there is a need to send patches for such things, just
>> > commit.
>>
>> Committed.
>>
>> Patch updated with newlines for ffmpeg. The swscale patch from the
>> last e-mail remains the same.
>
> a few things could be vertically aligned, except that ok if tested
> also if 2 patches depend on each other so neiter can be commited first then
> they have to be commited together in a single commit

A few things were vertically aligned up to a point where it looked
nice to me. Tested and applied.

There were some crashes when the memory allocation was forced to fail
in some points. I'm not too confident delving into h264 to check why
it crashes so I'll just open bug reports.