← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/libshine.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/libshine.c
102
102
 
103
103
    len = hdr.frame_size;
104
104
    if (len <= s->buffer_index) {
105
 
        if ((ret = ff_alloc_packet2(avctx, avpkt, len)))
 
105
        if ((ret = ff_alloc_packet2(avctx, avpkt, len, 0)))
106
106
            return ret;
107
107
        memcpy(avpkt->data, s->buffer, len);
108
108
        s->buffer_index -= len;
139
139
    .init                  = libshine_encode_init,
140
140
    .encode2               = libshine_encode_frame,
141
141
    .close                 = libshine_encode_close,
142
 
    .capabilities          = CODEC_CAP_DELAY,
 
142
    .capabilities          = AV_CODEC_CAP_DELAY,
143
143
    .sample_fmts           = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16P,
144
144
                                                            AV_SAMPLE_FMT_NONE },
145
145
    .supported_samplerates = libshine_sample_rates,