← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libav/trusty-proposed

« back to all changes in this revision

Viewing changes to libavformat/rso.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/rso.c
24
24
#include "rso.h"
25
25
 
26
26
const AVCodecTag ff_codec_rso_tags[] = {
27
 
    { CODEC_ID_PCM_U8,          0x0100 },
28
 
    { CODEC_ID_ADPCM_IMA_WAV,   0x0101 },
29
 
    { CODEC_ID_NONE, 0 },
 
27
    { AV_CODEC_ID_PCM_U8,          0x0100 },
 
28
    { AV_CODEC_ID_ADPCM_IMA_WAV,   0x0101 },
 
29
    { AV_CODEC_ID_NONE, 0 },
30
30
};