← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mpv/vivid

« back to all changes in this revision

Viewing changes to common/av_common.h

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2015-02-08 11:38:05 UTC
  • mfrom: (28.1.4 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20150208113805-hb7kk68170y002es
Tags: 0.7.3-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/rules:
    + Disable altivec on ppc64el again, as it FTBFS with it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/av_common.h
34
34
void mp_set_av_packet(AVPacket *dst, struct demux_packet *mpkt, AVRational *tb);
35
35
int64_t mp_pts_to_av(double mp_pts, AVRational *tb);
36
36
double mp_pts_from_av(int64_t av_pts, AVRational *tb);
37
 
void mp_set_avcodec_threads(AVCodecContext *avctx, int threads);
 
37
void mp_set_avcodec_threads(struct mp_log *l, AVCodecContext *avctx, int threads);
38
38
void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type);
39
39
int mp_codec_to_av_codec_id(const char *codec);
40
40
const char *mp_codec_from_av_codec_id(int codec_id);