← Back to branch summary

~ubuntu-branches/ubuntu/quantal/libav/quantal-updates

« back to all changes in this revision

Viewing changes to ffprobe.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2011-12-26 11:58:50 UTC
  • mfrom: (1.3.9 sid)
  • Revision ID: package-import@ubuntu.com-20111226115850-0v2ivu79li21q1cc
Tags: 4:0.7.3-2ubuntu1
* Merge from debian, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp, 
    x264, and xvid  (all in universe)
* Install libraries in multi-arch directories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffprobe.c
291
291
        if (!(codec = avcodec_find_decoder(stream->codec->codec_id))) {
292
292
            fprintf(stderr, "Unsupported codec with id %d for input stream %d\n",
293
293
                    stream->codec->codec_id, stream->index);
294
 
        } else if (avcodec_open(stream->codec, codec) < 0) {
 
294
        } else if (avcodec_open2(stream->codec, codec, NULL) < 0) {
295
295
            fprintf(stderr, "Error while opening codec for input stream %d\n",
296
296
                    stream->index);
297
297
        }