Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-04-17 11:27:17 +0300
committerHendrik Leppkes <h.leppkes@gmail.com>2017-08-04 20:18:33 +0300
commit14d7a3027055b1bf36a3a928f78e2ce2796f19d9 (patch)
treeadd0bc6dd808196dc1f25fa4521be08f58287b40
parent50409d3f73a7a2c19d987cb0c60cd593291bf56c (diff)
s302m: passthrough non-pcm by default and export non-pcm mode as codec tag
-rw-r--r--libavcodec/s302m.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/s302m.c b/libavcodec/s302m.c
index 4350d97f0a..dc0b735ff3 100644
--- a/libavcodec/s302m.c
+++ b/libavcodec/s302m.c
@@ -195,6 +195,7 @@ static int s302m_decode_frame(AVCodecContext *avctx, void *data,
}
avctx->sample_rate = 48000;
+ avctx->codec_tag = non_pcm_data_type;
*got_frame_ptr = 1;
@@ -203,7 +204,7 @@ static int s302m_decode_frame(AVCodecContext *avctx, void *data,
#define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_DECODING_PARAM
static const AVOption s302m_options[] = {
- {"non_pcm_mode", "Chooses what to do with NON-PCM", offsetof(S302Context, non_pcm_mode), AV_OPT_TYPE_INT, {.i64 = 3}, 0, 3, FLAGS, "non_pcm_mode"},
+ {"non_pcm_mode", "Chooses what to do with NON-PCM", offsetof(S302Context, non_pcm_mode), AV_OPT_TYPE_INT, {.i64 = 2}, 0, 3, FLAGS, "non_pcm_mode"},
{"copy" , "Pass NON-PCM through unchanged" , 0, AV_OPT_TYPE_CONST, {.i64 = 0}, 0, 3, FLAGS, "non_pcm_mode"},
{"drop" , "Drop NON-PCM" , 0, AV_OPT_TYPE_CONST, {.i64 = 1}, 0, 3, FLAGS, "non_pcm_mode"},
{"decode_copy" , "Decode if possible else passthrough", 0, AV_OPT_TYPE_CONST, {.i64 = 2}, 0, 3, FLAGS, "non_pcm_mode"},