← Back to branch summary

~siretart/libav/trusty-security

« back to all changes in this revision

Viewing changes to libavutil/fifo.h

  • 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:
libavutil/fifo.h
26
26
 
27
27
#include <stdint.h>
28
28
#include "avutil.h"
 
29
#include "attributes.h"
29
30
 
30
31
typedef struct AVFifoBuffer {
31
32
    uint8_t *buffer;
127
128
    return ptr;
128
129
}
129
130
 
130
 
#if FF_API_AV_FIFO_PEEK
131
 
/**
132
 
 * @deprecated Use av_fifo_peek2() instead.
133
 
 */
134
 
attribute_deprecated
135
 
static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs)
136
 
{
137
 
    return *av_fifo_peek2(f, offs);
138
 
}
139
 
#endif
140
 
 
141
131
#endif /* AVUTIL_FIFO_H */