summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-01-24 08:15:38 +0100
committerwm4 <wm4@nowhere>2017-01-24 08:15:38 +0100
commitc06fd19d8f031f15eb2001a112dd49c8c2b0e464 (patch)
tree349dc87c2a326c84a548df01b8148e5f6d8e1e17 /common
parentb14fac9afa79e44d8b0323c6ddbef1557cdd0d8d (diff)
downloadmpv-c06fd19d8f031f15eb2001a112dd49c8c2b0e464.tar.bz2
mpv-c06fd19d8f031f15eb2001a112dd49c8c2b0e464.tar.xz
av_common: drop unused function
Unused since the AVCodecParameters change.
Diffstat (limited to 'common')
-rw-r--r--common/av_common.c23
-rw-r--r--common/av_common.h1
2 files changed, 0 insertions, 24 deletions
diff --git a/common/av_common.c b/common/av_common.c
index f2f43498e3..e1ca2fc19e 100644
--- a/common/av_common.c
+++ b/common/av_common.c
@@ -50,29 +50,6 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size)
return 0;
}
-// Copy the codec-related fields from st into avctx. This does not set the
-// codec itself, only codec related header data provided by libavformat.
-// The goal is to initialize a new decoder with the header data provided by
-// libavformat, and unlike avcodec_copy_context(), allow the user to create
-// a clean AVCodecContext for a manually selected AVCodec.
-// This is strictly for decoding only.
-void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st)
-{
- mp_lavc_set_extradata(avctx, st->extradata, st->extradata_size);
- avctx->codec_tag = st->codec_tag;
- avctx->bit_rate = st->bit_rate;
- avctx->width = st->width;
- avctx->height = st->height;
- avctx->pix_fmt = st->pix_fmt;
- avctx->chroma_sample_location = st->chroma_sample_location;
- avctx->sample_rate = st->sample_rate;
- avctx->channels = st->channels;
- avctx->block_align = st->block_align;
- avctx->channel_layout = st->channel_layout;
- avctx->bits_per_coded_sample = st->bits_per_coded_sample;
- avctx->has_b_frames = st->has_b_frames;
-}
-
// This only copies ffmpeg-native codec parameters. Parameters produced by
// other demuxers must be handled manually.
void mp_set_lav_codec_headers(AVCodecContext *avctx, struct mp_codec_params *c)
diff --git a/common/av_common.h b/common/av_common.h
index 4b13dcdd0c..553c01a931 100644
--- a/common/av_common.h
+++ b/common/av_common.h
@@ -31,7 +31,6 @@ struct AVDictionary;
struct mp_log;
int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size);
-void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st);
void mp_set_lav_codec_headers(AVCodecContext *avctx, struct mp_codec_params *c);
AVRational mp_get_codec_timebase(struct mp_codec_params *c);
void mp_set_av_packet(AVPacket *dst, struct demux_packet *mpkt, AVRational *tb);