← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ffmpeg/vivid-proposed

« back to all changes in this revision

Viewing changes to libavformat/utils.c

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun
  • Date: 2015-02-14 23:14:52 UTC
  • mfrom: (0.1.22)
  • Revision ID: package-import@ubuntu.com-20150214231452-od0roffwuk2030e1
Tags: 7:2.5.4-1
http://bugs.debian.org/776649
* Import new upstream bugfix release 2.5.4.
* Drop configure-enable-vsx-together-with-altivec-for-ppc64el.patch
  included upstream.
* Add patches making the build binary reproducible.
* Stop using faketime.
* Correctly handle noopt in DEB_BUILD_OPTIONS.
* Disable assembler optimizations on ppc64el, as they don't work yet.
* Disable assembler optimizations on mips64(el), as they don't work yet.
  Thanks to James Cowgill. (Closes: #776649)
* Fix dep5-copyright-license-name-not-unique lintian warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/utils.c
2812
2812
 * And there are "variable" fps files this needs to detect as well. */
2813
2813
static int tb_unreliable(AVCodecContext *c)
2814
2814
{
2815
 
    if (c->time_base.den >= 101L * c->time_base.num ||
2816
 
        c->time_base.den <    5L * c->time_base.num ||
 
2815
    if (c->time_base.den >= 101LL * c->time_base.num ||
 
2816
        c->time_base.den <    5LL * c->time_base.num ||
2817
2817
        // c->codec_tag == AV_RL32("DIVX") ||
2818
2818
        // c->codec_tag == AV_RL32("XVID") ||
2819
2819
        c->codec_tag == AV_RL32("mp4v") ||
3650
3650
    st->info->last_dts = AV_NOPTS_VALUE;
3651
3651
 
3652
3652
    st->codec = avcodec_alloc_context3(c);
 
3653
    if (!st->codec) {
 
3654
        av_free(st->info);
 
3655
        av_free(st);
 
3656
        return NULL;
 
3657
    }
3653
3658
    if (s->iformat) {
3654
3659
        /* no default bitrate if decoding */
3655
3660
        st->codec->bit_rate = 0;