~ubuntu-branches/debian/experimental/libav/experimental

« back to all changes in this revision

Viewing changes to libavcodec/h264.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2014-08-17 22:33:40 UTC
  • mfrom: (1.1.30)
  • Revision ID: package-import@ubuntu.com-20140817223340-net3rzywma60pzhz
Tags: 6:11~beta1-1
* New upstream Release v11~alpha2
* build against libgnutls28-dev (Closes: #758447)
* Bump shlibs

Show diffs side-by-side

added added

removed removed

Lines of Context:
286
286
                   length + FF_INPUT_BUFFER_PADDING_SIZE);
287
287
    dst = h->rbsp_buffer[bufidx];
288
288
 
289
 
    if (dst == NULL)
 
289
    if (!dst)
290
290
        return NULL;
291
291
 
292
292
    memcpy(dst, src, i);
1379
1379
        ptr = ff_h264_decode_nal(h, buf + buf_index, &dst_length, &consumed,
1380
1380
                                 next_avc - buf_index);
1381
1381
 
1382
 
        if (ptr == NULL || dst_length < 0)
 
1382
        if (!ptr || dst_length < 0)
1383
1383
            return AVERROR_INVALIDDATA;
1384
1384
 
1385
1385
        buf_index += consumed;
1460
1460
 
1461
1461
            ptr = ff_h264_decode_nal(hx, buf + buf_index, &dst_length,
1462
1462
                                     &consumed, next_avc - buf_index);
1463
 
            if (ptr == NULL || dst_length < 0) {
 
1463
            if (!ptr || dst_length < 0) {
1464
1464
                ret = -1;
1465
1465
                goto end;
1466
1466
            }