← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libavformat/internal.h

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/internal.h
87
87
 * Add packet to AVFormatContext->packet_buffer list, determining its
88
88
 * interleaved position using compare() function argument.
89
89
 */
90
 
void ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
91
 
                              int (*compare)(AVFormatContext *, AVPacket *, AVPacket *));
 
90
int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
 
91
                             int (*compare)(AVFormatContext *, AVPacket *, AVPacket *));
92
92
 
93
93
void ff_read_frame_flush(AVFormatContext *s);
94
94
 
326
326
void ff_compute_frame_duration(int *pnum, int *pden, AVStream *st,
327
327
                               AVCodecParserContext *pc, AVPacket *pkt);
328
328
 
329
 
int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux);
330
 
 
331
329
unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id);
332
330
 
333
331
enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag);