diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 22:48:44 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 23:57:54 +0300 |
| commit | 1e7008675b2d930955b0295808ef208d92e5639d (patch) | |
| tree | 7613e4d48a8d265373b678fe709ec81ab3d1d308 /libavcodec/libvpx.h | |
| parent | 30e9ebb14f197bbc3fcbde467da39d1a79ac8d52 (diff) | |
| parent | 8655c54160767de1a6b96f8bc310d6e4eaceff48 (diff) | |
Merge commit '8655c54160767de1a6b96f8bc310d6e4eaceff48'
* commit '8655c54160767de1a6b96f8bc310d6e4eaceff48':
libvpx: Support the vp9 extended profiles
Conflicts:
Changelog
configure
libavcodec/libvpx.c
libavcodec/libvpx.h
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavcodec/version.h
mostly not merged, as requested by jamrial
See: 01e59d48ed1a41b88107ed1d4d56ae0cbcd1a60e
See: 079b7f6eacc09bc2813fc1ddc230ab05022b69c2 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libvpx.h')
| -rw-r--r-- | libavcodec/libvpx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/libvpx.h b/libavcodec/libvpx.h index 36a275c5d2..41c246ba74 100644 --- a/libavcodec/libvpx.h +++ b/libavcodec/libvpx.h @@ -24,5 +24,7 @@ #include "avcodec.h" void ff_vp9_init_static(AVCodec *codec); +enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt_t img); +vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelFormat pix); #endif /* AVCODEC_LIBVPX_H */ |