← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavformat/flvdec.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/flvdec.c
654
654
{
655
655
    av_free(flv->new_extradata[stream]);
656
656
    flv->new_extradata[stream] = av_mallocz(size +
657
 
                                            FF_INPUT_BUFFER_PADDING_SIZE);
 
657
                                            AV_INPUT_BUFFER_PADDING_SIZE);
658
658
    if (!flv->new_extradata[stream])
659
659
        return AVERROR(ENOMEM);
660
660
    flv->new_extradata_size[stream] = size;
789
789
static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
790
790
{
791
791
    FLVContext *flv = s->priv_data;
792
 
    int ret, i, type, size, flags;
 
792
    int ret, i, size, flags;
 
793
    enum FlvTagType type;
793
794
    int stream_type=-1;
794
795
    int64_t next, pos, meta_pos;
795
796
    int64_t dts, pts = AV_NOPTS_VALUE;
896
897
        }
897
898
        av_log(s, AV_LOG_TRACE, "%d %X %d \n", stream_type, flags, st->discard);
898
899
 
899
 
        if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY ||
900
 
            stream_type == FLV_STREAM_TYPE_AUDIO)
 
900
        if (s->pb->seekable &&
 
901
            ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY ||
 
902
              stream_type == FLV_STREAM_TYPE_AUDIO))
901
903
            av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME);
902
904
 
903
905
        if (  (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || (stream_type == FLV_STREAM_TYPE_AUDIO)))