← Back to branch summary

~ubuntu-branches/ubuntu/vivid/libav/vivid

« back to all changes in this revision

Viewing changes to libavformat/ivfdec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2013-10-22 23:24:08 UTC
  • mfrom: (1.3.36 sid)
  • Revision ID: package-import@ubuntu.com-20131022232408-b8tvvn4pyzri9mi3
Tags: 6:9.10-1ubuntu1
https://launchpad.net/bugs/1243235
https://launchpad.net/bugs/1180288
https://launchpad.net/bugs/1242802
* Build all -extra flavors from this source package, as libav got demoted
  from main to universe, cf LP: #1243235
* Simplify debian/rules to follow exactly the code that debian executes
* New upstream (LP: #1180288) fixes lots of security issues (LP: #1242802)
* Merge from unstable, remaining changes:
  - build-depend on libtiff5-dev rather than libtiff4-dev,
    avoids FTBFS caused by imlib
  - follow the regular debian codepaths

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/ivfdec.c
32
32
    return 0;
33
33
}
34
34
 
35
 
static int read_header(AVFormatContext *s, AVFormatParameters *ap)
 
35
static int read_header(AVFormatContext *s)
36
36
{
37
37
    AVStream *st;
38
38
    AVRational time_base;
86
86
    .read_probe     = probe,
87
87
    .read_header    = read_header,
88
88
    .read_packet    = read_packet,
89
 
    .flags= AVFMT_GENERIC_INDEX,
90
 
    .codec_tag = (const AVCodecTag*[]){ff_codec_bmp_tags, 0},
 
89
    .flags          = AVFMT_GENERIC_INDEX,
 
90
    .codec_tag      = (const AVCodecTag* const []){ ff_codec_bmp_tags, 0 },
91
91
};