← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavcodec/cavs_parser.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:
libavcodec/cavs_parser.c
98
98
}
99
99
 
100
100
AVCodecParser ff_cavsvideo_parser = {
101
 
    .codec_ids      = { CODEC_ID_CAVS },
102
 
    .priv_data_size = sizeof(ParseContext1),
 
101
    .codec_ids      = { AV_CODEC_ID_CAVS },
 
102
    .priv_data_size = sizeof(ParseContext),
103
103
    .parser_parse   = cavsvideo_parse,
104
 
    .parser_close   = ff_parse1_close,
 
104
    .parser_close   = ff_parse_close,
105
105
    .split          = ff_mpeg4video_split,
106
106
};