← Back to branch summary

~siretart/libav/trusty-security

« back to all changes in this revision

Viewing changes to avconv.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2013-03-27 07:57:15 UTC
  • mfrom: (1.3.32 sid)
  • Revision ID: package-import@ubuntu.com-20130327075715-0sg19vuqtup2xfjj
Tags: 6:0.8.6-1ubuntu1
https://launchpad.net/bugs/1160734
https://launchpad.net/bugs/1143929
https://launchpad.net/bugs/1101829
* Merge from debian/unstable, LP: #1160734, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp, frei0r,
    vo-aacenc, vo-amrenc, x264, and xvid  (all in universe)
  - do not build libav-extra-dbg, it is build from the libav-extra source
    package in ubuntu.
  - drop libav-regular-dbg, not necessary in ubuntu
  - Adjust LIB_PKGS/LIB_PKGS2 lists in debian/rules
  - several ifdefs in debian/rules that allow the use of the same file
    in libav and libav-extra (most of this can be merged into the debian
    package)
* Tested that co-instability of libavcodec-dev with libavcodec-extra-53 works.
  LP: #1143929, #1101829
* Remove all debug packages. In ubuntu, we provide debug symbols via the
  .ddeb infrastructure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avconv.c
2704
2704
            double  opts;
2705
2705
            ost = &output_streams[i];
2706
2706
            of = &output_files[ost->file_index];
 
2707
            if (ost->source_index < 0)
 
2708
                continue;
2707
2709
            os = output_files[ost->file_index].ctx;
2708
2710
            ist = &input_streams[ost->source_index];
2709
2711
            if (ost->is_past_recording_time || no_packet[ist->file_index] ||