[FFmpeg-cvslog] vf_colorspace: Add BT-names for gamma22/28 transfer option
ffmpeg | branch: master | Vittorio Giovara | Mon
Sep 12 19:44:02 2016 +0200| [d41bfa9c0b109e6ef8310392cf8a5ee6741a5ea5] |
committer: Ronald S. Bultje
vf_colorspace: Add BT-names for gamma22/28 transfer option
Allows to use values returned from API and from ffprobe directly.
Signed-off-by: Vittorio Giovara
Signed-off-by: Ronald S. Bultje
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d41bfa9c0b109e6ef8310392cf8a5ee6741a5ea5
---
libavfilter/vf_colorspace.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c
index 45fd917..b9ecb5f 100644
--- a/libavfilter/vf_colorspace.c
+++ b/libavfilter/vf_colorspace.c
@@ -1055,7 +1055,9 @@ static const AVOption colorspace_options[] = {
OFFSET(user_trc), AV_OPT_TYPE_INT, { .i64 = AVCOL_TRC_UNSPECIFIED },
AVCOL_TRC_RESERVED0, AVCOL_TRC_NB - 1, FLAGS, "trc" },
ENUM("bt709",AVCOL_TRC_BT709,"trc"),
+ENUM("bt470m", AVCOL_TRC_GAMMA22, "trc"),
ENUM("gamma22", AVCOL_TRC_GAMMA22, "trc"),
+ENUM("bt470bg", AVCOL_TRC_GAMMA28, "trc"),
ENUM("gamma28", AVCOL_TRC_GAMMA28, "trc"),
ENUM("smpte170m",AVCOL_TRC_SMPTE170M,"trc"),
ENUM("smpte240m",AVCOL_TRC_SMPTE240M,"trc"),
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/af_amerge: allow merging 1 input only
ffmpeg | branch: master | Marton Balint | Mon Sep 5 21:51:21
2016 +0200| [025db5afaf28228aa14f9621b09bd424a2c1adfb] | committer: Marton
Balint
avfilter/af_amerge: allow merging 1 input only
Useful when the amerge filter parameters are generated from a script based on
the number of input streams, by allowing 1 input it does not have to be handled
specially.
The split filter also allows 1 output, so it is more consistent to allow
merging 1 input as well.
Reviewed-by: Nicolas George
Signed-off-by: Marton Balint
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=025db5afaf28228aa14f9621b09bd424a2c1adfb
---
libavfilter/af_amerge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 2b4edb0..4a8c6d5 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -52,7 +52,7 @@ typedef struct {
static const AVOption amerge_options[] = {
{ "inputs", "specify the number of inputs", OFFSET(nb_inputs),
- AV_OPT_TYPE_INT, { .i64 = 2 }, 2, SWR_CH_MAX, FLAGS },
+ AV_OPT_TYPE_INT, { .i64 = 2 }, 1, SWR_CH_MAX, FLAGS },
{ NULL }
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/hlsenc: Avoid "%T" "%F" in strftime() to improve compatibility
ffmpeg | branch: master | Michael Niedermayer | Tue Sep 13 22:55:12 2016 +0200| [22ba9a3cb8c0e7069d03cf8b142ddbfc5f65ba38] | committer: Michael Niedermayer avformat/hlsenc: Avoid "%T" "%F" in strftime() to improve compatibility Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22ba9a3cb8c0e7069d03cf8b142ddbfc5f65ba38 --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index a376312..157dbd4 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -544,7 +544,7 @@ static int hls_window(AVFormatContext *s, int last) tt = (int64_t)prog_date_time; milli = av_clip(lrint(1000*(prog_date_time - tt)), 0, 999); tm = localtime_r(&tt, &tmpbuf); -strftime(buf0, sizeof(buf0), "%FT%T", tm); +strftime(buf0, sizeof(buf0), "%Y-%m-%dT%H:%M:%S", tm); strftime(buf1, sizeof(buf1), "%z", tm); avio_printf(out, "#EXT-X-PROGRAM-DATE-TIME:%s.%03d%s\n", buf0, milli, buf1); prog_date_time += en->duration; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/hlsenc: Assume UTC if "%z" is unsupported in strftime()
ffmpeg | branch: master | Michael Niedermayer | Tue Sep 13 23:06:06 2016 +0200| [9f18a970b2df951007266ac80093723db5638599] | committer: Michael Niedermayer avformat/hlsenc: Assume UTC if "%z" is unsupported in strftime() Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f18a970b2df951007266ac80093723db5638599 --- libavformat/hlsenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 157dbd4..46b439d 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -545,7 +545,8 @@ static int hls_window(AVFormatContext *s, int last) milli = av_clip(lrint(1000*(prog_date_time - tt)), 0, 999); tm = localtime_r(&tt, &tmpbuf); strftime(buf0, sizeof(buf0), "%Y-%m-%dT%H:%M:%S", tm); -strftime(buf1, sizeof(buf1), "%z", tm); +if (!strftime(buf1, sizeof(buf1), "%z", tm)) +av_strlcpy(buf1, "Z", sizeof(buf1)); avio_printf(out, "#EXT-X-PROGRAM-DATE-TIME:%s.%03d%s\n", buf0, milli, buf1); prog_date_time += en->duration; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/flvenc: add FLVFlags for flvflags options
ffmpeg | branch: master | Steven Liu | Tue Sep 13
21:59:56 2016 +0800| [84aebfc74ee35bb9cdd3a3bf64b7c54ae867a916] | committer:
Michael Niedermayer
avformat/flvenc: add FLVFlags for flvflags options
add FLVFlags type, be used to add new FLVFlags options
Signed-off-by: Steven Liu
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=84aebfc74ee35bb9cdd3a3bf64b7c54ae867a916
---
libavformat/flvenc.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index ccbcf64..a3623f8 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -61,6 +61,10 @@ static const AVCodecTag flv_audio_codec_ids[] = {
{ AV_CODEC_ID_NONE, 0 }
};
+typedef enum {
+FLV_AAC_SEQ_HEADER_DETECT = (1 << 0),
+} FLVFlags;
+
typedef struct FLVContext {
AVClass *av_class;
int reserved;
@@ -364,7 +368,7 @@ static void flv_write_codec_header(AVFormatContext* s,
AVCodecParameters* par) {
avio_w8(pb, get_audio_flags(s, par));
avio_w8(pb, 0); // AAC sequence header
-if (!par->extradata_size && flv->flags & 1) {
+if (!par->extradata_size && flv->flags &
FLV_AAC_SEQ_HEADER_DETECT) {
PutBitContext pbc;
int samplerate_index;
int channels = flv->audio_par->channels
@@ -718,7 +722,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket
*pkt)
static const AVOption options[] = {
{ "flvflags", "FLV muxer flags", offsetof(FLVContext, flags),
AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM,
"flvflags" },
-{ "aac_seq_header_detect", "Put AAC sequence header based on stream data",
0, AV_OPT_TYPE_CONST, {.i64 = 1}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM,
"flvflags" },
+{ "aac_seq_header_detect", "Put AAC sequence header based on stream data",
0, AV_OPT_TYPE_CONST, {.i64 = FLV_AAC_SEQ_HEADER_DETECT}, INT_MIN, INT_MAX,
AV_OPT_FLAG_ENCODING_PARAM, "flvflags" },
{ NULL },
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ffmpeg: copy trailing_padding when using -acodec copy
ffmpeg | branch: master | Jon Toohill | Mon Aug 15 13:13:07 2016 -0700| [7f386bbe2a7976e39475360800c54c7484ac2719] | committer: James Almer ffmpeg: copy trailing_padding when using -acodec copy Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f386bbe2a7976e39475360800c54c7484ac2719 --- ffmpeg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ffmpeg.c b/ffmpeg.c index d858407..4225978 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3000,6 +3000,7 @@ static int transcode_init(void) enc_ctx->audio_service_type = dec_ctx->audio_service_type; enc_ctx->block_align= dec_ctx->block_align; enc_ctx->initial_padding= dec_ctx->delay; +enc_ctx->trailing_padding = dec_ctx->trailing_padding; enc_ctx->profile= dec_ctx->profile; #if FF_API_AUDIOENC_DELAY enc_ctx->delay = dec_ctx->delay; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
