← Back to branch summary

~ubuntu-branches/debian/sid/ffmpeg/sid

« back to all changes in this revision

Viewing changes to libavcodec/asvenc.c

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun, Fabian Greffrath, Andreas Cadhalpun
  • Date: 2015-09-22 15:15:20 UTC
  • mfrom: (0.1.29)
  • Revision ID: package-import@ubuntu.com-20150922151520-hhmd3in9ykigjvs9
Tags: 7:2.8-1
http://bugs.debian.org/786670
http://bugs.debian.org/798189
[ Fabian Greffrath ]
* Pass the --dbg-package=ffmpeg-dbg parameter only to dh_strip.
* Add alternative Depends: libavcodec-ffmpeg-extra56 to libavcodec-dev and
  ffmpeg-dbg to allow for building and debugging with this library installed.

[ Andreas Cadhalpun ]
* Import new major upstream release 2.8.
* Remove the transitional lib*-ffmpeg-dev packages.
* Drop old Breaks on kodi-bin.
* Drop workaround for sparc, which is no Debian architecture anymore.
* Re-enable x265 on alpha, as it's available again.
* Disable unavailable frei0r, opencv and x264 on mips64el.
* Disable libopenjpeg (#787275) and libschroedinger (#787957) decoders.
  (Closes: #786670)
* Disable libdc1394 on sparc64, because it links against the broken due to
  #790560 libudev1.
* Enable libsnappy support.
* Add new symbols.
* Update debian/copyright.
* Update debian/tests/encdec_list.txt.
* Add hls-only-seek-if-there-is-an-offset.patch. (Closes: #798189)
* Add 'Breaks: libavutil-ffmpeg54 (>= 8:0)' to the libraries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/asvenc.c
207
207
    for (i = 0; i < 4; i++)
208
208
        a->fdsp.fdct(block[i]);
209
209
 
210
 
    if (!(a->avctx->flags & CODEC_FLAG_GRAY)) {
 
210
    if (!(a->avctx->flags & AV_CODEC_FLAG_GRAY)) {
211
211
        a->pdsp.get_pixels(block[4], ptr_cb, frame->linesize[1]);
212
212
        a->pdsp.get_pixels(block[5], ptr_cr, frame->linesize[2]);
213
213
        for (i = 4; i < 6; i++)
265
265
    }
266
266
 
267
267
    if ((ret = ff_alloc_packet2(avctx, pkt, a->mb_height * a->mb_width * MAX_MB_SIZE +
268
 
                                FF_MIN_BUFFER_SIZE)) < 0)
 
268
                                AV_INPUT_BUFFER_MIN_SIZE, 0)) < 0)
269
269
        return ret;
270
270
 
271
271
    init_put_bits(&a->pb, pkt->data, pkt->size);
363
363
    .encode2        = encode_frame,
364
364
    .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
365
365
                                                     AV_PIX_FMT_NONE },
366
 
    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE |
367
 
                      FF_CODEC_CAP_INIT_CLEANUP,
 
366
    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
368
367
};
369
368
#endif
370
369
 
379
378
    .encode2        = encode_frame,
380
379
    .pix_fmts       = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
381
380
                                                     AV_PIX_FMT_NONE },
382
 
    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE |
383
 
                      FF_CODEC_CAP_INIT_CLEANUP,
 
381
    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
384
382
};
385
383
#endif