← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/h261enc.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/h261enc.c
68
68
 
69
69
    put_bits(&s->pb, 1, 0); /* split screen off */
70
70
    put_bits(&s->pb, 1, 0); /* camera  off */
71
 
    put_bits(&s->pb, 1, 0); /* freeze picture release off */
 
71
    put_bits(&s->pb, 1, s->pict_type == AV_PICTURE_TYPE_I); /* freeze picture release on/off */
72
72
 
73
73
    format = ff_h261_get_picture_format(s->width, s->height);
74
74
 
75
75
    put_bits(&s->pb, 1, format); /* 0 == QCIF, 1 == CIF */
76
76
 
77
 
    put_bits(&s->pb, 1, 0); /* still image mode */
78
 
    put_bits(&s->pb, 1, 0); /* reserved */
 
77
    put_bits(&s->pb, 1, 1); /* still image mode */
 
78
    put_bits(&s->pb, 1, 1); /* reserved */
79
79
 
80
80
    put_bits(&s->pb, 1, 0); /* no PEI */
81
81
    if (format == 0)
378
378
    s->intra_ac_vlc_last_length = s->inter_ac_vlc_last_length = uni_h261_rl_len + 128*64;
379
379
}
380
380
 
381
 
FF_MPV_GENERIC_CLASS(h261)
 
381
static const AVClass h261_class = {
 
382
    .class_name = "h261 encoder",
 
383
    .item_name  = av_default_item_name,
 
384
    .option     = ff_mpv_generic_options,
 
385
    .version    = LIBAVUTIL_VERSION_INT,
 
386
};
382
387
 
383
388
AVCodec ff_h261_encoder = {
384
389
    .name           = "h261",