← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/x86/hpeldsp_init.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/x86/hpeldsp_init.c
230
230
    c->avg_pixels_tab[1][2] = ff_avg_pixels8_y2_mmxext;
231
231
    c->avg_pixels_tab[1][3] = ff_avg_pixels8_xy2_mmxext;
232
232
 
233
 
    if (!(flags & CODEC_FLAG_BITEXACT)) {
 
233
    if (!(flags & AV_CODEC_FLAG_BITEXACT)) {
234
234
        c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_mmxext;
235
235
        c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_mmxext;
236
236
        c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_mmxext;
240
240
        c->avg_pixels_tab[1][3] = ff_avg_approx_pixels8_xy2_mmxext;
241
241
    }
242
242
 
243
 
    if (CONFIG_VP3_DECODER && flags & CODEC_FLAG_BITEXACT) {
 
243
    if (CONFIG_VP3_DECODER && flags & AV_CODEC_FLAG_BITEXACT) {
244
244
        c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_mmxext;
245
245
        c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_mmxext;
246
246
    }
266
266
    c->avg_pixels_tab[1][2] = ff_avg_pixels8_y2_3dnow;
267
267
    c->avg_pixels_tab[1][3] = ff_avg_pixels8_xy2_3dnow;
268
268
 
269
 
    if (!(flags & CODEC_FLAG_BITEXACT)){
 
269
    if (!(flags & AV_CODEC_FLAG_BITEXACT)){
270
270
        c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_3dnow;
271
271
        c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_3dnow;
272
272
        c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_3dnow;
276
276
        c->avg_pixels_tab[1][3] = ff_avg_approx_pixels8_xy2_3dnow;
277
277
    }
278
278
 
279
 
    if (CONFIG_VP3_DECODER && flags & CODEC_FLAG_BITEXACT) {
 
279
    if (CONFIG_VP3_DECODER && flags & AV_CODEC_FLAG_BITEXACT) {
280
280
        c->put_no_rnd_pixels_tab[1][1] = ff_put_no_rnd_pixels8_x2_exact_3dnow;
281
281
        c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_exact_3dnow;
282
282
    }