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

[Ramiro Polla]

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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ff_alloc_or_goto.diff
Type: application/octet-stream
Size: 20595 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/attachments/20090904/0ee45448/attachment-0001.obj>