← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavformat/rawenc.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:
libavformat/rawenc.c
56
56
#endif
57
57
 
58
58
#if CONFIG_ADX_MUXER
 
59
 
 
60
static int adx_write_trailer(AVFormatContext *s)
 
61
{
 
62
    AVIOContext *pb = s->pb;
 
63
    AVCodecContext *avctx = s->streams[0]->codec;
 
64
 
 
65
    if (pb->seekable) {
 
66
        int64_t file_size = avio_tell(pb);
 
67
        uint64_t sample_count = (file_size - 36) / avctx->channels / 18 * 32;
 
68
        if (sample_count <= UINT32_MAX) {
 
69
            avio_seek(pb, 12, SEEK_SET);
 
70
            avio_wb32(pb, sample_count);
 
71
            avio_seek(pb, file_size, SEEK_SET);
 
72
        }
 
73
    }
 
74
 
 
75
    return 0;
 
76
}
 
77
 
59
78
AVOutputFormat ff_adx_muxer = {
60
79
    .name              = "adx",
61
80
    .long_name         = NULL_IF_CONFIG_SMALL("CRI ADX"),
64
83
    .video_codec       = AV_CODEC_ID_NONE,
65
84
    .write_header      = force_one_stream,
66
85
    .write_packet      = ff_raw_write_packet,
 
86
    .write_trailer     = adx_write_trailer,
67
87
    .flags             = AVFMT_NOTIMESTAMPS,
68
88
};
69
89
#endif