[FFmpeg-cvslog] avformat/flvdec: add flv_ignore_prevtag option into flvdec
ffmpeg | branch: master | Steven Liu | Tue Aug 7
15:48:23 2018 +0800| [d37125fb910e466ab3e505afd0a687486f4e7c93] | committer:
Steven Liu
avformat/flvdec: add flv_ignore_prevtag option into flvdec
Signed-off-by: Steven Liu
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d37125fb910e466ab3e505afd0a687486f4e7c93
---
doc/demuxers.texi| 3 +++
libavformat/flvdec.c | 4
2 files changed, 7 insertions(+)
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 072918be28..5007e6339f 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -269,6 +269,9 @@ ffmpeg -f live_flv -i rtmp:///anything/key
@table @option
@item -flv_metadata @var{bool}
Allocate the streams according to the onMetaData array content.
+
+@item -flv_ignore_prevtag @var{bool}
+Ignore the size of previous tag value.
@end table
@section gif
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 975641757a..ff91008371 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -44,6 +44,7 @@
typedef struct FLVContext {
const AVClass *class; ///< Class for private options.
int trust_metadata; ///< configure streams according onMetaData
+int trust_datasize; ///< trust data size of FLVTag
int wrong_dts;///< wrong dts due to negative cts
uint8_t *new_extradata[FLV_STREAM_TYPE_NB];
int new_extradata_size[FLV_STREAM_TYPE_NB];
@@ -1250,6 +1251,7 @@ retry_duration:
leave:
last = avio_rb32(s->pb);
+if (!flv->trust_datasize) {
if (last != orig_size + 11 && last != orig_size + 10 &&
!avio_feof(s->pb) &&
(last != orig_size || !last) && last != flv->sum_flv_tag_size &&
@@ -1262,6 +1264,7 @@ leave:
goto retry;
}
}
+}
return ret;
}
@@ -1277,6 +1280,7 @@ static int flv_read_seek(AVFormatContext *s, int
stream_index,
#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
static const AVOption options[] = {
{ "flv_metadata", "Allocate streams according to the onMetaData array",
OFFSET(trust_metadata), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD },
+{ "flv_ignore_prevtag", "Ignore the Size of previous tag",
OFFSET(trust_datasize), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD },
{ "missing_streams", "", OFFSET(missing_streams), AV_OPT_TYPE_INT, { .i64
= 0 }, 0, 0xFF, VD | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY },
{ NULL }
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/flvdec: reindent code for previous commit
ffmpeg | branch: master | Steven Liu | Tue Aug 7
15:50:47 2018 +0800| [3b99bb38890375ebef2851a35bc048a37f6fd7f1] | committer:
Steven Liu
avformat/flvdec: reindent code for previous commit
Signed-off-by: Steven Liu
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b99bb38890375ebef2851a35bc048a37f6fd7f1
---
libavformat/flvdec.c | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index ff91008371..ce3cac04ab 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -1252,19 +1252,19 @@ retry_duration:
leave:
last = avio_rb32(s->pb);
if (!flv->trust_datasize) {
-if (last != orig_size + 11 && last != orig_size + 10 &&
-!avio_feof(s->pb) &&
-(last != orig_size || !last) && last != flv->sum_flv_tag_size &&
-!flv->broken_sizes) {
-av_log(s, AV_LOG_ERROR, "Packet mismatch %d %d %d\n", last, orig_size
+ 11, flv->sum_flv_tag_size);
-avio_seek(s->pb, pos + 1, SEEK_SET);
-ret = resync(s);
-av_packet_unref(pkt);
-if (ret >= 0) {
-goto retry;
+if (last != orig_size + 11 && last != orig_size + 10 &&
+!avio_feof(s->pb) &&
+(last != orig_size || !last) && last != flv->sum_flv_tag_size &&
+!flv->broken_sizes) {
+av_log(s, AV_LOG_ERROR, "Packet mismatch %d %d %d\n", last,
orig_size + 11, flv->sum_flv_tag_size);
+avio_seek(s->pb, pos + 1, SEEK_SET);
+ret = resync(s);
+av_packet_unref(pkt);
+if (ret >= 0) {
+goto retry;
+}
}
}
-}
return ret;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/flvdec: add flv_full_metadata option into flvdec
ffmpeg | branch: master | Steven Liu | Tue Aug 7
15:51:36 2018 +0800| [243ecadad5e5e83afdd518c067030e12ac457120] | committer:
Steven Liu
avformat/flvdec: add flv_full_metadata option into flvdec
output all the metadata context when use this option.
Signed-off-by: Steven Liu
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=243ecadad5e5e83afdd518c067030e12ac457120
---
doc/demuxers.texi| 3 +++
libavformat/flvdec.c | 6 --
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 5007e6339f..aad94eb50e 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -272,6 +272,9 @@ Allocate the streams according to the onMetaData array
content.
@item -flv_ignore_prevtag @var{bool}
Ignore the size of previous tag value.
+
+@item -flv_full_metadata @var{bool}
+Output all context of the onMetadata.
@end table
@section gif
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index ce3cac04ab..93c7f85237 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -45,6 +45,7 @@ typedef struct FLVContext {
const AVClass *class; ///< Class for private options.
int trust_metadata; ///< configure streams according onMetaData
int trust_datasize; ///< trust data size of FLVTag
+int dump_full_metadata; ///< Dump full metadata of the onMetadata
int wrong_dts;///< wrong dts due to negative cts
uint8_t *new_extradata[FLV_STREAM_TYPE_NB];
int new_extradata_size[FLV_STREAM_TYPE_NB];
@@ -612,7 +613,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream
*astream,
(!vpar && !strcmp(key, "videocodecid"
s->ctx_flags &= ~AVFMTCTX_NOHEADER; //If there is either
audio/video missing, codecid will be an empty object
-if (!strcmp(key, "duration")||
+if ((!strcmp(key, "duration")||
!strcmp(key, "filesize")||
!strcmp(key, "width") ||
!strcmp(key, "height") ||
@@ -624,7 +625,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream
*astream,
!strcmp(key, "audiosamplesize") ||
!strcmp(key, "stereo") ||
!strcmp(key, "audiocodecid")||
-!strcmp(key, "datastream"))
+!strcmp(key, "datastream")) && !flv->dump_full_metadata)
return 0;
s->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED;
@@ -1280,6 +1281,7 @@ static int flv_read_seek(AVFormatContext *s, int
stream_index,
#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
static const AVOption options[] = {
{ "flv_metadata", "Allocate streams according to the onMetaData array",
OFFSET(trust_metadata), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD },
+{ "flv_full_metadata", "Dump full metadata of the onMetadata",
OFFSET(dump_full_metadata), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD },
{ "flv_ignore_prevtag", "Ignore the Size of previous tag",
OFFSET(trust_datasize), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD },
{ "missing_streams", "", OFFSET(missing_streams), AV_OPT_TYPE_INT, { .i64
= 0 }, 0, 0xFF, VD | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY },
{ NULL }
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libavfilter: Adds on the fly generation of default DNN models for tensorflow backend instead of storing binary model.
ffmpeg | branch: master | Sergey Lavrushkin | Fri Jul 27 19:31:55 2018 +0300| [4eb63efbdaea6d36ad94f1bb0dd129b7f7aaa899] | committer: Pedro Arthur libavfilter: Adds on the fly generation of default DNN models for tensorflow backend instead of storing binary model. Signed-off-by: Pedro Arthur > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4eb63efbdaea6d36ad94f1bb0dd129b7f7aaa899 --- libavfilter/dnn_backend_native.c |12 +- libavfilter/dnn_backend_tf.c | 271 +- libavfilter/dnn_espcn.h | 17981 +++-- libavfilter/dnn_srcnn.h | 7013 +-- libavfilter/vf_sr.c |24 +- 5 files changed, 7742 insertions(+), 17559 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commitdiff;h=4eb63efbdaea6d36ad94f1bb0dd129b7f7aaa899 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] libavfilter: Code style fixes for pointers in DNN module and sr filter.
ffmpeg | branch: master | Sergey Lavrushkin | Fri Jul 27
19:34:02 2018 +0300| [9d87897ba84a3b639a4c3afeb4ec6d21bc306a92] | committer:
Pedro Arthur
libavfilter: Code style fixes for pointers in DNN module and sr filter.
Signed-off-by: Pedro Arthur
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d87897ba84a3b639a4c3afeb4ec6d21bc306a92
---
libavfilter/dnn_backend_native.c | 84 +++---
libavfilter/dnn_backend_native.h | 8 +--
libavfilter/dnn_backend_tf.c | 108 +++
libavfilter/dnn_backend_tf.h | 8 +--
libavfilter/dnn_espcn.h | 6 +--
libavfilter/dnn_interface.c | 4 +-
libavfilter/dnn_interface.h | 16 +++---
libavfilter/dnn_srcnn.h | 6 +--
libavfilter/vf_sr.c | 60 +++---
9 files changed, 150 insertions(+), 150 deletions(-)
diff --git a/libavfilter/dnn_backend_native.c b/libavfilter/dnn_backend_native.c
index 3e6b86280d..baefea7fcb 100644
--- a/libavfilter/dnn_backend_native.c
+++ b/libavfilter/dnn_backend_native.c
@@ -34,15 +34,15 @@ typedef enum {RELU, TANH, SIGMOID} ActivationFunc;
typedef struct Layer{
LayerType type;
-float* output;
-void* params;
+float *output;
+void *params;
} Layer;
typedef struct ConvolutionalParams{
int32_t input_num, output_num, kernel_size;
ActivationFunc activation;
-float* kernel;
-float* biases;
+float *kernel;
+float *biases;
} ConvolutionalParams;
typedef struct InputParams{
@@ -55,16 +55,16 @@ typedef struct DepthToSpaceParams{
// Represents simple feed-forward convolutional network.
typedef struct ConvolutionalNetwork{
-Layer* layers;
+Layer *layers;
int32_t layers_num;
} ConvolutionalNetwork;
-static DNNReturnType set_input_output_native(void* model, DNNData* input,
DNNData* output)
+static DNNReturnType set_input_output_native(void *model, DNNData *input,
DNNData *output)
{
-ConvolutionalNetwork* network = (ConvolutionalNetwork*)model;
-InputParams* input_params;
-ConvolutionalParams* conv_params;
-DepthToSpaceParams* depth_to_space_params;
+ConvolutionalNetwork *network = (ConvolutionalNetwork *)model;
+InputParams *input_params;
+ConvolutionalParams *conv_params;
+DepthToSpaceParams *depth_to_space_params;
int cur_width, cur_height, cur_channels;
int32_t layer;
@@ -72,7 +72,7 @@ static DNNReturnType set_input_output_native(void* model,
DNNData* input, DNNDat
return DNN_ERROR;
}
else{
-input_params = (InputParams*)network->layers[0].params;
+input_params = (InputParams *)network->layers[0].params;
input_params->width = cur_width = input->width;
input_params->height = cur_height = input->height;
input_params->channels = cur_channels = input->channels;
@@ -88,14 +88,14 @@ static DNNReturnType set_input_output_native(void* model,
DNNData* input, DNNDat
for (layer = 1; layer < network->layers_num; ++layer){
switch (network->layers[layer].type){
case CONV:
-conv_params = (ConvolutionalParams*)network->layers[layer].params;
+conv_params = (ConvolutionalParams *)network->layers[layer].params;
if (conv_params->input_num != cur_channels){
return DNN_ERROR;
}
cur_channels = conv_params->output_num;
break;
case DEPTH_TO_SPACE:
-depth_to_space_params =
(DepthToSpaceParams*)network->layers[layer].params;
+depth_to_space_params = (DepthToSpaceParams
*)network->layers[layer].params;
if (cur_channels % (depth_to_space_params->block_size *
depth_to_space_params->block_size) != 0){
return DNN_ERROR;
}
@@ -127,16 +127,16 @@ static DNNReturnType set_input_output_native(void* model,
DNNData* input, DNNDat
// layers_num,layer_type,layer_parameterss,layer_type,layer_parameters...
// For CONV layer: activation_function, input_num, output_num, kernel_size,
kernel, biases
// For DEPTH_TO_SPACE layer: block_size
-DNNModel* ff_dnn_load_model_native(const char* model_filename)
+DNNModel *ff_dnn_load_model_native(const char *model_filename)
{
-DNNModel* model = NULL;
-ConvolutionalNetwork* network = NULL;
-AVIOContext* model_file_context;
+DNNModel *model = NULL;
+ConvolutionalNetwork *network = NULL;
+AVIOContext *model_file_context;
int file_size, dnn_size, kernel_size, i;
int32_t layer;
LayerType layer_type;
-ConvolutionalParams* conv_params;
-DepthToSpaceParams* depth_to_space_params;
+ConvolutionalParams *conv_params;
+DepthToSpaceParams *depth_to_space_params;
model = av_malloc(sizeof(DNNModel));
if (!model){
@@ -155,7 +155,7 @@ DNNModel* ff_dnn_load_model_native(const char*
model_filename)
av_freep(&model);
return NULL;
}
-model->model = (void*)network;
+
[FFmpeg-cvslog] libavfilter: Fixes warnings for unused variables in dnn_srcnn.h, dnn_espcn.h, dnn_backend_tf.c.
ffmpeg | branch: master | Sergey Lavrushkin | Sat Jul 28
12:55:02 2018 +0300| [a66e74306a36c8467452a67d2d1af51dbbb9b4c5] | committer:
Pedro Arthur
libavfilter: Fixes warnings for unused variables in dnn_srcnn.h, dnn_espcn.h,
dnn_backend_tf.c.
Signed-off-by: Pedro Arthur
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a66e74306a36c8467452a67d2d1af51dbbb9b4c5
---
libavfilter/dnn_backend_tf.c | 66 ++--
libavfilter/dnn_espcn.h | 37 -
libavfilter/dnn_srcnn.h | 35 ---
3 files changed, 64 insertions(+), 74 deletions(-)
diff --git a/libavfilter/dnn_backend_tf.c b/libavfilter/dnn_backend_tf.c
index 6528a2a390..bd21137a8a 100644
--- a/libavfilter/dnn_backend_tf.c
+++ b/libavfilter/dnn_backend_tf.c
@@ -375,9 +375,71 @@ DNNModel *ff_dnn_load_default_model_tf(DNNDefaultModel
model_type)
TFModel *tf_model = NULL;
TF_OperationDescription *op_desc;
TF_Operation *op;
-TF_Operation *const_ops_buffer[6];
TF_Output input;
-int64_t input_shape[] = {1, -1, -1, 1};
+static const int64_t input_shape[] = {1, -1, -1, 1};
+static const char tanh[] = "Tanh";
+static const char sigmoid[] = "Sigmoid";
+static const char relu[] = "Relu";
+
+static const float *srcnn_consts[] = {
+srcnn_conv1_kernel,
+srcnn_conv1_bias,
+srcnn_conv2_kernel,
+srcnn_conv2_bias,
+srcnn_conv3_kernel,
+srcnn_conv3_bias
+};
+static const long int *srcnn_consts_dims[] = {
+srcnn_conv1_kernel_dims,
+srcnn_conv1_bias_dims,
+srcnn_conv2_kernel_dims,
+srcnn_conv2_bias_dims,
+srcnn_conv3_kernel_dims,
+srcnn_conv3_bias_dims
+};
+static const int srcnn_consts_dims_len[] = {
+4,
+1,
+4,
+1,
+4,
+1
+};
+static const char *srcnn_activations[] = {
+relu,
+relu,
+relu
+};
+
+static const float *espcn_consts[] = {
+espcn_conv1_kernel,
+espcn_conv1_bias,
+espcn_conv2_kernel,
+espcn_conv2_bias,
+espcn_conv3_kernel,
+espcn_conv3_bias
+};
+static const long int *espcn_consts_dims[] = {
+espcn_conv1_kernel_dims,
+espcn_conv1_bias_dims,
+espcn_conv2_kernel_dims,
+espcn_conv2_bias_dims,
+espcn_conv3_kernel_dims,
+espcn_conv3_bias_dims
+};
+static const int espcn_consts_dims_len[] = {
+4,
+1,
+4,
+1,
+4,
+1
+};
+static const char *espcn_activations[] = {
+tanh,
+tanh,
+sigmoid
+};
input.index = 0;
diff --git a/libavfilter/dnn_espcn.h b/libavfilter/dnn_espcn.h
index a0dd61cd0d..9344aa90fe 100644
--- a/libavfilter/dnn_espcn.h
+++ b/libavfilter/dnn_espcn.h
@@ -5398,41 +5398,4 @@ static const long int espcn_conv3_bias_dims[] = {
4
};
-static const float *espcn_consts[] = {
-espcn_conv1_kernel,
-espcn_conv1_bias,
-espcn_conv2_kernel,
-espcn_conv2_bias,
-espcn_conv3_kernel,
-espcn_conv3_bias
-};
-
-static const long int *espcn_consts_dims[] = {
-espcn_conv1_kernel_dims,
-espcn_conv1_bias_dims,
-espcn_conv2_kernel_dims,
-espcn_conv2_bias_dims,
-espcn_conv3_kernel_dims,
-espcn_conv3_bias_dims
-};
-
-static const int espcn_consts_dims_len[] = {
-4,
-1,
-4,
-1,
-4,
-1
-};
-
-static const char espcn_tanh[] = "Tanh";
-
-static const char espcn_sigmoid[] = "Sigmoid";
-
-static const char *espcn_activations[] = {
-espcn_tanh,
-espcn_tanh,
-espcn_sigmoid
-};
-
#endif
diff --git a/libavfilter/dnn_srcnn.h b/libavfilter/dnn_srcnn.h
index 26143654b8..4f5332ce18 100644
--- a/libavfilter/dnn_srcnn.h
+++ b/libavfilter/dnn_srcnn.h
@@ -2110,39 +2110,4 @@ static const long int srcnn_conv3_bias_dims[] = {
1
};
-static const float *srcnn_consts[] = {
-srcnn_conv1_kernel,
-srcnn_conv1_bias,
-srcnn_conv2_kernel,
-srcnn_conv2_bias,
-srcnn_conv3_kernel,
-srcnn_conv3_bias
-};
-
-static const long int *srcnn_consts_dims[] = {
-srcnn_conv1_kernel_dims,
-srcnn_conv1_bias_dims,
-srcnn_conv2_kernel_dims,
-srcnn_conv2_bias_dims,
-srcnn_conv3_kernel_dims,
-srcnn_conv3_bias_dims
-};
-
-static const int srcnn_consts_dims_len[] = {
-4,
-1,
-4,
-1,
-4,
-1
-};
-
-static const char srcnn_relu[] = "Relu";
-
-static const char *srcnn_activations[] = {
-srcnn_relu,
-srcnn_relu,
-srcnn_relu
-};
-
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc/libx264: Support monochrome encoding.
ffmpeg | branch: master | Carl Eugen Hoyos | Tue Aug 7
20:41:02 2018 +0200| [81f25a105136bc404df63bf8386e90492ef84944] | committer:
Carl Eugen Hoyos
lavc/libx264: Support monochrome encoding.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81f25a105136bc404df63bf8386e90492ef84944
---
libavcodec/libx264.c | 10 ++
libavcodec/version.h | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 12379ff763..54e6703d73 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -161,6 +161,8 @@ static int avfmt2_num_planes(int avfmt)
case AV_PIX_FMT_BGR0:
case AV_PIX_FMT_BGR24:
case AV_PIX_FMT_RGB24:
+case AV_PIX_FMT_GRAY8:
+case AV_PIX_FMT_GRAY10:
return 1;
default:
@@ -443,6 +445,10 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt)
#ifdef X264_CSP_NV21
case AV_PIX_FMT_NV21: return X264_CSP_NV21;
#endif
+#ifdef X264_CSP_I400
+case AV_PIX_FMT_GRAY8:
+case AV_PIX_FMT_GRAY10:return X264_CSP_I400;
+#endif
};
return 0;
}
@@ -885,6 +891,10 @@ static const enum AVPixelFormat pix_fmts_all[] = {
AV_PIX_FMT_YUV422P10,
AV_PIX_FMT_YUV444P10,
AV_PIX_FMT_NV20,
+#ifdef X264_CSP_I400
+AV_PIX_FMT_GRAY8,
+AV_PIX_FMT_GRAY10,
+#endif
AV_PIX_FMT_NONE
};
#if CONFIG_LIBX264RGB_ENCODER
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 3f0d98efdf..907c6fb111 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 22
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avs2: correct avs2 description
ffmpeg | branch: master | hwren | Tue Aug 7 18:39:34 2018
+0800| [f563e7868fb9540e1c8a589558fba2beaaba01e0] | committer: Gyan Doshi
avs2: correct avs2 description
Signed-off-by: hwren
Signed-off-by: Gyan Doshi
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f563e7868fb9540e1c8a589558fba2beaaba01e0
---
doc/decoders.texi| 2 +-
doc/general.texi | 2 +-
libavcodec/avs2_parser.c | 2 +-
libavcodec/codec_desc.c | 2 +-
libavcodec/libdavs2.c| 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/decoders.texi b/doc/decoders.texi
index 9439b7b96a..31e96fbc8d 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -49,7 +49,7 @@ top-field-first is assumed
@section libdavs2
-AVS2/IEEE 1857.4 video decoder wrapper.
+AVS2-P2/IEEE1857.4 video decoder wrapper.
This decoder allows libavcodec to decode AVS2 streams with davs2 library.
diff --git a/doc/general.texi b/doc/general.texi
index cd725bb51d..3d1584097e 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -19,7 +19,7 @@ explicitly requested by passing the appropriate flags to
@section libdavs2
-FFmpeg can make use of the davs2 library for AVS2/IEEE 1857.4 video decoding.
+FFmpeg can make use of the davs2 library for AVS2-P2/IEEE1857.4 video decoding.
Go to @url{https://github.com/pkuvcl/davs2} and follow the instructions for
installing the library. Then pass @code{--enable-libdavs2} to configure to
diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c
index 520e98a9b4..1c9b3423ff 100644
--- a/libavcodec/avs2_parser.c
+++ b/libavcodec/avs2_parser.c
@@ -1,5 +1,5 @@
/*
- * AVS2/IEEE 1857.4 video parser.
+ * AVS2-P2/IEEE1857.4 video parser.
* Copyright (c) 2018 Huiwen Ren
*
* This file is part of FFmpeg.
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 2fe47b..1cbb241389 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -1398,7 +1398,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.id= AV_CODEC_ID_AVS2,
.type = AVMEDIA_TYPE_VIDEO,
.name = "avs2",
-.long_name = NULL_IF_CONFIG_SMALL("AVS2/IEEE 1857.4"),
+.long_name = NULL_IF_CONFIG_SMALL("AVS2-P2/IEEE1857.4"),
.props = AV_CODEC_PROP_LOSSY,
},
{
diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c
index 12db1f9da7..70aae3e5eb 100644
--- a/libavcodec/libdavs2.c
+++ b/libavcodec/libdavs2.c
@@ -163,7 +163,7 @@ static int davs2_decode_frame(AVCodecContext *avctx, void
*data,
AVCodec ff_libdavs2_decoder = {
.name = "libdavs2",
-.long_name = NULL_IF_CONFIG_SMALL("Decoder for AVS2/IEEE 1857.4"),
+.long_name = NULL_IF_CONFIG_SMALL("libdavs2 AVS2-P2/IEEE1857.4"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_AVS2,
.priv_data_size = sizeof(DAVS2Context),
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ffmpeg: simplify refcounting packets for the muxing queue
ffmpeg | branch: master | James Almer | Sun Aug 5 21:34:14 2018 -0300| [b955a33314d4707f3c90c75d7c319d2020ec111a] | committer: James Almer ffmpeg: simplify refcounting packets for the muxing queue Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b955a33314d4707f3c90c75d7c319d2020ec111a --- fftools/ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 55faec8ede..2459374f08 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -724,11 +724,11 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u if (ret < 0) exit_program(1); } -ret = av_packet_ref(&tmp_pkt, pkt); +ret = av_packet_make_refcounted(pkt); if (ret < 0) exit_program(1); +av_packet_move_ref(&tmp_pkt, pkt); av_fifo_generic_write(ost->muxing_queue, &tmp_pkt, sizeof(tmp_pkt), NULL); -av_packet_unref(pkt); return; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] MAINTAINERS: add myself to MIPS section
ffmpeg | branch: master | Shiyou Yin | Thu Jul 26 11:46:23 2018 +0800| [90dc584d21eba6a1caed0a0be72dc00a62593db4] | committer: Michael Niedermayer MAINTAINERS: add myself to MIPS section Signed-off-by: Shiyou Yin Reviewed-by: Manojkumar Bhosale Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90dc584d21eba6a1caed0a0be72dc00a62593db4 --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 234b655cef..3dd26e374f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -524,7 +524,7 @@ Operating systems / CPU architectures = Alpha Falk Hueffner -MIPSManojkumar Bhosale +MIPSManojkumar Bhosale, Shiyou Yin Mac OS X / PowerPC Romain Dolbeau, Guillaume Poirier Amiga / PowerPC Colin Ward Windows MinGW Alex Beregszaszi, Ramiro Polla ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
