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

« back to all changes in this revision

Viewing changes to libavcodec/aacdec.c

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2013-07-11 09:21:04 UTC
  • mfrom: (1.3.33 sid)
  • Revision ID: package-import@ubuntu.com-20130711092104-bpwqqjna11vp50vy
Tags: 6:0.8.7-1ubuntu1
* Merge from debian/unstable, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp, frei0r,
    vo-aacenc, vo-amrenc, x264, and xvid  (all in universe)
  - do not build libav-extra-dbg, it is build from the libav-extra source
    package in ubuntu.
  - drop libav-regular-dbg, not necessary in ubuntu
  - Adjust LIB_PKGS/LIB_PKGS2 lists in debian/rules
  - several ifdefs in debian/rules that allow the use of the same file
    in libav and libav-extra (most of this can be merged into the debian
    package)

Show diffs side-by-side

added added

removed removed

Lines of Context:
192
192
                                 enum ChannelPosition che_pos[4][MAX_ELEM_ID],
193
193
                                 int type, int id, int *channels)
194
194
{
 
195
    if (*channels >= MAX_CHANNELS)
 
196
        return AVERROR_INVALIDDATA;
195
197
    if (che_pos[type][id]) {
196
198
        if (!ac->che[type][id]) {
197
199
            if (!(ac->che[type][id] = av_mallocz(sizeof(ChannelElement))))