summaryrefslogtreecommitdiffstats
path: root/core/av_common.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-03 01:55:48 +0200
committerwm4 <wm4@nowhere>2013-06-03 22:40:07 +0200
commit9f4261de65c18d3a34e70c9f969966ca85c80a8d (patch)
treef9a563589dff67799230508bcc87fe8001fc0ef1 /core/av_common.h
parent13a1ce16f9581871cf7ac0d06ece407534a98f89 (diff)
downloadmpv-9f4261de65c18d3a34e70c9f969966ca85c80a8d.tar.bz2
mpv-9f4261de65c18d3a34e70c9f969966ca85c80a8d.tar.xz
core: add common function to initialize AVPacket
Audio and video had their own (very similar) functions to initialize an AVPacket (ffmpeg's packet struct) from a demux_packet (mplayer's packet struct). Add a common function for these. Also use this function for sd_lavc_conv. This is actually a functional change, as some libavfilter subtitle demuxers add weird out-of-band stuff as side-data.
Diffstat (limited to 'core/av_common.h')
-rw-r--r--core/av_common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/av_common.h b/core/av_common.h
index 25593ed3d0..2fa8f127b0 100644
--- a/core/av_common.h
+++ b/core/av_common.h
@@ -22,8 +22,10 @@
#include <libavcodec/avcodec.h>
struct mp_decoder_list;
+struct demux_packet;
void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st);
+void mp_set_av_packet(AVPacket *dst, struct demux_packet *mpkt);
void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type);
int mp_codec_to_av_codec_id(const char *codec);
const char *mp_codec_from_av_codec_id(int codec_id);