← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavdevice/alsa-audio-enc.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:
libavdevice/alsa-audio-enc.c
47
47
    AlsaData *s = s1->priv_data;
48
48
    AVStream *st;
49
49
    unsigned int sample_rate;
50
 
    enum CodecID codec_id;
 
50
    enum AVCodecID codec_id;
51
51
    int res;
52
52
 
53
53
    st = s1->streams[0];
106
106
    .long_name      = NULL_IF_CONFIG_SMALL("ALSA audio output"),
107
107
    .priv_data_size = sizeof(AlsaData),
108
108
    .audio_codec    = DEFAULT_CODEC_ID,
109
 
    .video_codec    = CODEC_ID_NONE,
 
109
    .video_codec    = AV_CODEC_ID_NONE,
110
110
    .write_header   = audio_write_header,
111
111
    .write_packet   = audio_write_packet,
112
112
    .write_trailer  = ff_alsa_close,