[FFmpeg-cvslog] lpc: increase error array size of ff_lpc_calc_ref_coefs_f by one
ffmpeg | branch: master | Rostislav Pehlivanov | Sat Sep
5 08:51:19 2015 +0100| [7591f8319b06d7ac6cfc16a852f24a46063f0595] | committer:
Rostislav Pehlivanov
lpc: increase error array size of ff_lpc_calc_ref_coefs_f by one
Signed-off-by: Rostislav Pehlivanov
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7591f8319b06d7ac6cfc16a852f24a46063f0595
---
libavcodec/lpc.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c
index 315997c..5cda779 100644
--- a/libavcodec/lpc.c
+++ b/libavcodec/lpc.c
@@ -172,7 +172,7 @@ double ff_lpc_calc_ref_coefs_f(LPCContext *s, const float
*samples, int len,
{
int i;
double signal = 0.0f, avg_err = 0.0f;
-double autoc[MAX_LPC_ORDER+1] = {0}, error[MAX_LPC_ORDER] = {0};
+double autoc[MAX_LPC_ORDER+1] = {0}, error[MAX_LPC_ORDER+1] = {0};
const double c = (len - 1)/2.0f;
/* Welch window */
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] aacenc_is: add a flag to use pure coefficients instead
ffmpeg | branch: master | Rostislav Pehlivanov | Sat Sep
5 08:32:09 2015 +0100| [4565611b04d53b7333fa5ed81e5dc0074482c20c] | committer:
Rostislav Pehlivanov
aacenc_is: add a flag to use pure coefficients instead
This commit adds a flag to use the pure coefficients instead
of the processed ones (sce->coeffs). This is needed because
IS will apply the changes to the coefficients immediately
before the adjust_common_prediction function and it doesn't
make sense to measure stereo channel coefficient difference
when one of the channels coefficients are all zero.
Therefore add a flag to use pure coefficients in that case.
TNS is the only thing touching the coefficients before IS
so common window prediction will not take that into account
but the effect of the TNS filter per coefficient can be small
(a few percent) so to some approximation it's fine to just
ignore that.
Also fixed a small error which doesn't alter the results
that much. pow(sqrt(number), 3.0/4.0) == pow(number, 3.0/8.0) !=
pow(number, 3.0/4.0).
Signed-off-by: Rostislav Pehlivanov
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4565611b04d53b7333fa5ed81e5dc0074482c20c
---
libavcodec/aacenc_is.c | 36 ++--
libavcodec/aacenc_is.h |3 ++-
libavcodec/aacenc_pred.c |8
3 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/libavcodec/aacenc_is.c b/libavcodec/aacenc_is.c
index 88ba915..bb201f6 100644
--- a/libavcodec/aacenc_is.c
+++ b/libavcodec/aacenc_is.c
@@ -32,39 +32,39 @@
struct AACISError ff_aac_is_encoding_err(AACEncContext *s, ChannelElement *cpe,
int start, int w, int g, float ener0,
- float ener1, float ener01, int phase)
+ float ener1, float ener01,
+ int use_pcoeffs, int phase)
{
int i, w2;
+SingleChannelElement *sce0 = &cpe->ch[0];
+SingleChannelElement *sce1 = &cpe->ch[1];
+float *L = use_pcoeffs ? sce0->pcoeffs : sce0->coeffs;
+float *R = use_pcoeffs ? sce1->pcoeffs : sce1->coeffs;
float *L34 = &s->scoefs[256*0], *R34 = &s->scoefs[256*1];
float *IS = &s->scoefs[256*2], *I34 = &s->scoefs[256*3];
float dist1 = 0.0f, dist2 = 0.0f;
struct AACISError is_error = {0};
-SingleChannelElement *sce0 = &cpe->ch[0];
-SingleChannelElement *sce1 = &cpe->ch[1];
for (w2 = 0; w2 < sce0->ics.group_len[w]; w2++) {
FFPsyBand *band0 = &s->psy.ch[s->cur_channel+0].psy_bands[(w+w2)*16+g];
FFPsyBand *band1 = &s->psy.ch[s->cur_channel+1].psy_bands[(w+w2)*16+g];
int is_band_type, is_sf_idx = FFMAX(1, sce0->sf_idx[(w+w2)*16+g]-4);
-float e01_34 = phase*pow(sqrt(ener1/ener0), 3.0/4.0);
+float e01_34 = phase*pow(ener1/ener0, 3.0/4.0);
float maxval, dist_spec_err = 0.0f;
float minthr = FFMIN(band0->threshold, band1->threshold);
-for (i = 0; i < sce0->ics.swb_sizes[g]; i++) {
-IS[i] = (sce0->pcoeffs[start+(w+w2)*128+i]+
- phase*sce1->pcoeffs[start+(w+w2)*128+i])*
- sqrt(ener0/ener01);
-}
-abs_pow34_v(L34, &sce0->coeffs[start+(w+w2)*128],
sce0->ics.swb_sizes[g]);
-abs_pow34_v(R34, &sce1->coeffs[start+(w+w2)*128],
sce0->ics.swb_sizes[g]);
-abs_pow34_v(I34, IS,
sce0->ics.swb_sizes[g]);
+for (i = 0; i < sce0->ics.swb_sizes[g]; i++)
+IS[i] = (L[start+(w+w2)*128+i] +
phase*R[start+(w+w2)*128+i])*sqrt(ener0/ener01);
+abs_pow34_v(L34, &L[start+(w+w2)*128], sce0->ics.swb_sizes[g]);
+abs_pow34_v(R34, &R[start+(w+w2)*128], sce0->ics.swb_sizes[g]);
+abs_pow34_v(I34, IS, sce0->ics.swb_sizes[g]);
maxval = find_max_val(1, sce0->ics.swb_sizes[g], I34);
is_band_type = find_min_book(maxval, is_sf_idx);
-dist1 += quantize_band_cost(s, &sce0->coeffs[start + (w+w2)*128], L34,
+dist1 += quantize_band_cost(s, &L[start + (w+w2)*128], L34,
sce0->ics.swb_sizes[g],
sce0->sf_idx[(w+w2)*16+g],
sce0->band_type[(w+w2)*16+g],
s->lambda / band0->threshold, INFINITY,
NULL, 0);
-dist1 += quantize_band_cost(s, &sce1->coeffs[start + (w+w2)*128], R34,
+dist1 += quantize_band_cost(s, &R[start + (w+w2)*128], R34,
sce1->ics.swb_sizes[g],
sce1->sf_idx[(w+w2)*16+g],
sce1->band_type[(w+w2)*16+g],
@@ -111,15 +111,15 @@ void ff_aac_search_for_is(AACEncContext *s,
AVCodecContext *avctx, ChannelElemen
for (i = 0; i < sce0->ics.swb_sizes[g]; i++) {
float coef0 = sce0->pcoeffs[start+(w+w2)*128+i];
[FFmpeg-cvslog] aacenc_tns: adjust coefficient calculation, add double filter support
ffmpeg | branch: master | Rostislav Pehlivanov | Sat Sep
5 09:08:30 2015 +0100| [e3faad811e429002d549562db4e0fc30c08dc6a4] | committer:
Rostislav Pehlivanov
aacenc_tns: adjust coefficient calculation, add double filter support
This commit improves the TNS implementation to the point where it's
actually usable and very rarely results in nastyness (in all bitrates
except extremely low bitrates it's increasing the quality and prevents
some distortions from the coder being audiable).
Also adds a double filter support which is only used if the energy
difference between the top and bottom of the SFBs is above the
thresholds defined in the header file. Looking at the bitstream
that fdk_aac generates it sometimes used a double filter despite
the specs stating that a single filter should be enough for almost
all cases and purposes.
Unlike FAAC or fdk_aac we sometimes use a reverse filter in case
the energy difference isn't enought to use a double filter. This
actually works better.
Signed-off-by: Rostislav Pehlivanov
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3faad811e429002d549562db4e0fc30c08dc6a4
---
libavcodec/aacenc_tns.c | 48 +--
libavcodec/aacenc_tns.h | 10 ++
2 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c
index 3c442e8..637b813 100644
--- a/libavcodec/aacenc_tns.c
+++ b/libavcodec/aacenc_tns.c
@@ -67,7 +67,7 @@ void ff_aac_encode_tns_info(AACEncContext *s,
SingleChannelElement *sce)
}
}
-static int quantize_coefs(double *coef, int *idx, float *lpc, int order)
+static inline void quantize_coefs(double *coef, int *idx, float *lpc, int
order)
{
int i;
uint8_t u_coef;
@@ -79,7 +79,6 @@ static int quantize_coefs(double *coef, int *idx, float *lpc,
int order)
u_coef = (idx[i])&(~(~0ics.max_sfb);
const int is8 = sce->ics.window_sequence[0] == EIGHT_SHORT_SEQUENCE;
-int order = is8 ? 7 : s->profile == FF_PROFILE_AAC_LOW ? 12 :
TNS_MAX_ORDER;
+const int order = is8 ? 7 : s->profile == FF_PROFILE_AAC_LOW ? 12 :
TNS_MAX_ORDER;
int sfb_start = av_clip(tns_min_sfb[is8][s->samplerate_index], 0, mmm);
int sfb_end = av_clip(sce->ics.num_swb, 0, mmm);
for (w = 0; w < sce->ics.num_windows; w++) {
-float en_low = 0.0f, en_high = 0.0f, threshold = 0.0f, spread = 0.0f;
+float e_ratio = 0.0f, threshold = 0.0f, spread = 0.0f, en[2] = {0.0,
0.0f};
double gain = 0.0f, coefs[MAX_LPC_ORDER] = {0};
-
int coef_start = w*sce->ics.num_swb + sce->ics.swb_offset[sfb_start];
int coef_len = sce->ics.swb_offset[sfb_end] -
sce->ics.swb_offset[sfb_start];
@@ -147,9 +145,9 @@ void ff_aac_search_for_tns(AACEncContext *s,
SingleChannelElement *sce)
for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) {
FFPsyBand *band =
&s->psy.ch[s->cur_channel].psy_bands[(w+w2)*16+g];
if ((w+w2)*16+g > sfb_start + ((sfb_end - sfb_start)/2))
-en_high += band->energy;
+en[1] += band->energy;
else
-en_low += band->energy;
+en[0] += band->energy;
threshold += band->threshold;
spread += band->spread;
}
@@ -157,22 +155,36 @@ void ff_aac_search_for_tns(AACEncContext *s,
SingleChannelElement *sce)
if (coef_len <= 0 || (sfb_end - sfb_start) <= 0)
continue;
+else
+e_ratio = en[0]/en[1];
/* LPC */
gain = ff_lpc_calc_ref_coefs_f(&s->lpc, &sce->coeffs[coef_start],
coef_len, order, coefs);
-gain *= s->lambda/110.0f;
-
-if (gain > TNS_GAIN_THRESHOLD_LOW && gain*0 < TNS_GAIN_THRESHOLD_HIGH
&&
-(en_low+en_high) > TNS_GAIN_THRESHOLD_LOW*threshold &&
-spread > TNS_SPREAD_THRESHOLD) {
-tns->n_filt[w] = 1;
-for (g = 0; g < tns->n_filt[w]; g++) {
-tns->length[w][g] = sfb_end - sfb_start;
-tns->direction[w][g] = en_low < en_high && TNS_DIRECTION_VARY;
-tns->order[w][g] = quantize_coefs(coefs, tns->coef_idx[w][g],
- tns->coef[w][g], order);
+if (gain > TNS_GAIN_THRESHOLD_LOW && gain < TNS_GAIN_THRESHOLD_HIGH &&
+(en[0]+en[1]) > TNS_GAIN_THRESHOLD_LOW*threshold &&
+spread < TNS_SPREAD_THRESHOLD && order) {
+if (is8 || order < 2 || (e_ratio > TNS_E_RATIO_LOW && e_ratio <
TNS_E_RATIO_HIGH)) {
+tns->n_filt[w] = 1;
+for (g = 0; g < tns->n_filt[w]; g++) {
+tns->length[w][g] = sfb_end - sfb_start;
+tns->direction[w][g] = en[0] < en[1];
+tns->order[w][g] = order;
+quantize_coefs(coefs, tns->coef_idx[w]
[FFmpeg-cvslog] fate: adjust AAC encoder TNS test target
ffmpeg | branch: master | Rostislav Pehlivanov | Sat Sep 5 09:11:05 2015 +0100| [5ab3b6a8a53db1a6d76d5dc61dcde04b14333a2e] | committer: Rostislav Pehlivanov fate: adjust AAC encoder TNS test target The new commits improve the quality. Signed-off-by: Rostislav Pehlivanov > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ab3b6a8a53db1a6d76d5dc61dcde04b14333a2e --- tests/fate/aac.mak |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 6fe3003..06b2497 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -172,7 +172,7 @@ fate-aac-tns-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-re fate-aac-tns-encode: CMP = stddev fate-aac-tns-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav fate-aac-tns-encode: CMP_SHIFT = -4096 -fate-aac-tns-encode: CMP_TARGET = 660.85 +fate-aac-tns-encode: CMP_TARGET = 648.50 fate-aac-tns-encode: FUZZ = 2.8 fate-aac-tns-encode: SIZE_TOLERANCE = 3560 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavf/aiffenc: Clarify an error message.
ffmpeg | branch: master | Carl Eugen Hoyos | Sat Sep 5
10:53:55 2015 +0200| [da8eb70dc3fcf51dcf686f17a3e55b4b8696b156] | committer:
Carl Eugen Hoyos
lavf/aiffenc: Clarify an error message.
Only one audio stream is allowed in aiff.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da8eb70dc3fcf51dcf686f17a3e55b4b8696b156
---
libavformat/aiffenc.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index e2828e7..3abd284 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -112,7 +112,7 @@ static int aiff_write_header(AVFormatContext *s)
if (aiff->audio_stream_idx < 0 && st->codec->codec_type ==
AVMEDIA_TYPE_AUDIO) {
aiff->audio_stream_idx = i;
} else if (st->codec->codec_type != AVMEDIA_TYPE_VIDEO) {
-av_log(s, AV_LOG_ERROR, "Only audio streams and pictures are
allowed in AIFF.\n");
+av_log(s, AV_LOG_ERROR, "AIFF allows only one audio stream and a
picture.\n");
return AVERROR(EINVAL);
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/avfilter: Add a few more basic filters to the list which support frame size changes
ffmpeg | branch: master | Michael Niedermayer | Sat
Sep 5 11:43:27 2015 +0200| [5d859e59809f38334592fc43f8ae70a23b5a9597] |
committer: Michael Niedermayer
avfilter/avfilter: Add a few more basic filters to the list which support frame
size changes
Fixes assertion failures
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5d859e59809f38334592fc43f8ae70a23b5a9597
---
libavfilter/avfilter.c |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 4d833f0..843ac98 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1161,8 +1161,11 @@ int ff_filter_frame(AVFilterLink *link, AVFrame *frame)
/* Consistency checks */
if (link->type == AVMEDIA_TYPE_VIDEO) {
-if (strcmp(link->dst->filter->name, "scale") &&
-strcmp(link->dst->filter->name, "idet")) {
+if (strcmp(link->dst->filter->name, "buffersink") &&
+strcmp(link->dst->filter->name, "format") &&
+strcmp(link->dst->filter->name, "idet") &&
+strcmp(link->dst->filter->name, "null") &&
+strcmp(link->dst->filter->name, "scale")) {
av_assert1(frame->format == link->format);
av_assert1(frame->width == link->w);
av_assert1(frame->height == link->h);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/rawenc: Use AVFrame parameters instead of AVCodecContext
ffmpeg | branch: master | Michael Niedermayer | Sat
Sep 5 11:56:23 2015 +0200| [c41a59330f49c16acfa9b0552608fa1f41a0d823] |
committer: Michael Niedermayer
avcodec/rawenc: Use AVFrame parameters instead of AVCodecContext
This allows encoding raw frames with changing dimensions
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c41a59330f49c16acfa9b0552608fa1f41a0d823
---
libavcodec/rawenc.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c
index 75e7269..c23225f 100644
--- a/libavcodec/rawenc.c
+++ b/libavcodec/rawenc.c
@@ -49,21 +49,21 @@ FF_ENABLE_DEPRECATION_WARNINGS
static int raw_encode(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet)
{
-int ret = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
+int ret = avpicture_get_size(frame->format, frame->width, frame->height);
if (ret < 0)
return ret;
if ((ret = ff_alloc_packet2(avctx, pkt, ret, ret)) < 0)
return ret;
-if ((ret = avpicture_layout((const AVPicture *)frame, avctx->pix_fmt,
avctx->width,
-avctx->height, pkt->data, pkt->size)) < 0)
+if ((ret = avpicture_layout((const AVPicture *)frame, frame->format,
frame->width,
+frame->height, pkt->data, pkt->size)) < 0)
return ret;
if(avctx->codec_tag == AV_RL32("yuv2") && ret > 0 &&
- avctx->pix_fmt == AV_PIX_FMT_YUYV422) {
+ frame->format == AV_PIX_FMT_YUYV422) {
int x;
-for(x = 1; x < avctx->height*avctx->width*2; x += 2)
+for(x = 1; x < frame->height*frame->width*2; x += 2)
pkt->data[x] ^= 0x80;
}
pkt->flags |= AV_PKT_FLAG_KEY;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/hls: Check for av_opt_set_dict() failure
ffmpeg | branch: master | Michael Niedermayer | Sat
Sep 5 14:21:47 2015 +0200| [4eca1939ef0614d0959fffb93f93d44af6740e8c] |
committer: Michael Niedermayer
avformat/hls: Check for av_opt_set_dict() failure
Fixes: CID1320426
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4eca1939ef0614d0959fffb93f93d44af6740e8c
---
libavformat/hls.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index 82dd744..c16c770 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -516,13 +516,15 @@ static int url_connect(struct playlist *pls, AVDictionary
*opts, AVDictionary *o
av_dict_copy(&tmp, opts, 0);
av_dict_copy(&tmp, opts2, 0);
-av_opt_set_dict(pls->input, &tmp);
+if ((ret = av_opt_set_dict(pls->input, &tmp)) < 0)
+goto fail;
if ((ret = ffurl_connect(pls->input, NULL)) < 0) {
ffurl_close(pls->input);
pls->input = NULL;
}
+fail:
av_dict_free(&tmp);
return ret;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/vf_stack: Fix memleak of out frame
ffmpeg | branch: master | Michael Niedermayer | Sat
Sep 5 14:41:45 2015 +0200| [7eab904d11dedfdcdf4d22ed1116cc148ca40b59] |
committer: Michael Niedermayer
avfilter/vf_stack: Fix memleak of out frame
Fixes CID1322347
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7eab904d11dedfdcdf4d22ed1116cc148ca40b59
---
libavfilter/vf_stack.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c
index 6342e3f..8a90caa 100644
--- a/libavfilter/vf_stack.c
+++ b/libavfilter/vf_stack.c
@@ -116,8 +116,10 @@ static int process_frame(FFFrameSync *fs)
int linesize[4];
int height[4];
-if ((ret = av_image_fill_linesizes(linesize, inlink->format,
inlink->w)) < 0)
+if ((ret = av_image_fill_linesizes(linesize, inlink->format,
inlink->w)) < 0) {
+av_frame_free(&out);
return ret;
+}
height[1] = height[2] = FF_CEIL_RSHIFT(inlink->h,
s->desc->log2_chroma_h);
height[0] = height[3] = inlink->h;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/af_amerge: avoid undefined shift (<<64) in outlayout setup
ffmpeg | branch: master | Michael Niedermayer | Fri
Sep 4 00:33:49 2015 +0200| [a3ad51e0d5b3ff6634c1be6322ce82c17105e82b] |
committer: Michael Niedermayer
avfilter/af_amerge: avoid undefined shift (<<64) in outlayout setup
Fixes CID1322306
Reviewed-by: Ganesh Ajjanagadde
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3ad51e0d5b3ff6634c1be6322ce82c17105e82b
---
libavfilter/af_amerge.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 9c3cfed..410d613 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -110,8 +110,8 @@ static int query_formats(AVFilterContext *ctx)
for (i = 0; i < nb_ch; i++)
s->route[i] = i;
outlayout = av_get_default_channel_layout(nb_ch);
-if (!outlayout)
-outlayout = ((int64_t)1 << nb_ch) - 1;
+if (!outlayout && nb_ch)
+outlayout = 0xULL >> (64 - nb_ch);
} else {
int *route[SWR_CH_MAX];
int c, out_ch_number = 0;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/avf_showfreqs: Free fin
ffmpeg | branch: master | Michael Niedermayer | Sat Sep 5 15:32:00 2015 +0200| [7213d3fbf30b6be53c272c1c61c797a2b7b697a0] | committer: Michael Niedermayer avfilter/avf_showfreqs: Free fin Fixes CID1322345 Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7213d3fbf30b6be53c272c1c61c797a2b7b697a0 --- libavfilter/avf_showfreqs.c |1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c index cbbf040..af32eae 100644 --- a/libavfilter/avf_showfreqs.c +++ b/libavfilter/avf_showfreqs.c @@ -501,6 +501,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) goto fail; ret = plot_freqs(inlink, fin); +av_frame_free(&fin); av_audio_fifo_drain(s->fifo, s->skip_samples); if (ret < 0) goto fail; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/avf_showfreqs: Fix "may be used uninitialized in this function" warning
ffmpeg | branch: master | Michael Niedermayer | Sat
Sep 5 15:34:35 2015 +0200| [0ada8ec1a50c0ec157988f0a166adf977b482d37] |
committer: Michael Niedermayer
avfilter/avf_showfreqs: Fix "may be used uninitialized in this function" warning
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ada8ec1a50c0ec157988f0a166adf977b482d37
---
libavfilter/avf_showfreqs.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c
index af32eae..1bbaa92 100644
--- a/libavfilter/avf_showfreqs.c
+++ b/libavfilter/avf_showfreqs.c
@@ -484,7 +484,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
AVFilterContext *ctx = inlink->dst;
ShowFreqsContext *s = ctx->priv;
AVFrame *fin = NULL;
-int ret;
+int ret = 0;
av_audio_fifo_write(s->fifo, (void **)in->extended_data, in->nb_samples);
while (av_audio_fifo_size(s->fifo) >= s->win_size) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/avf_showfreqs: Fix memleak of out frame
ffmpeg | branch: master | Michael Niedermayer | Sat
Sep 5 15:35:37 2015 +0200| [8ca97b5e4f470cf24fac5e0599dd63c7af142c22] |
committer: Michael Niedermayer
avfilter/avf_showfreqs: Fix memleak of out frame
Fixes CID1322344
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ca97b5e4f470cf24fac5e0599dd63c7af142c22
---
libavfilter/avf_showfreqs.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c
index 1bbaa92..c00e4d8 100644
--- a/libavfilter/avf_showfreqs.c
+++ b/libavfilter/avf_showfreqs.c
@@ -452,8 +452,10 @@ static int plot_freqs(AVFilterLink *inlink, AVFrame *in)
#define M(a, b) (sqrt((a) * (a) + (b) * (b)))
colors = av_strdup(s->colors);
-if (!colors)
+if (!colors) {
+av_frame_free(&out);
return AVERROR(ENOMEM);
+}
for (ch = 0; ch < s->nb_channels; ch++) {
uint8_t fg[4] = { 0xff, 0xff, 0xff, 0xff };
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] sws: Drop deprecated SWS_CPU_CAPS defines
ffmpeg | branch: master | Vittorio Giovara | Tue Jul 28 14:30:17 2015 +0100| [9d58639e270f7612874681e0ca30fa461e2667b7] | committer: Vittorio Giovara sws: Drop deprecated SWS_CPU_CAPS defines Deprecated in 07/2012. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d58639e270f7612874681e0ca30fa461e2667b7 --- libswscale/swscale.h | 16 libswscale/version.h |7 --- 2 files changed, 23 deletions(-) diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 8abbac4..dfdab41 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -82,22 +82,6 @@ const char *swscale_license(void); #define SWS_ACCURATE_RND 0x4 #define SWS_BITEXACT 0x8 -#if FF_API_SWS_CPU_CAPS -/** - * CPU caps are autodetected now, those flags - * are only provided for API compatibility. - */ -#define SWS_CPU_CAPS_MMX 0x8000 -#define SWS_CPU_CAPS_MMXEXT 0x2000 -#define SWS_CPU_CAPS_MMX2 0x2000 -#define SWS_CPU_CAPS_3DNOW0x4000 -#define SWS_CPU_CAPS_ALTIVEC 0x1000 -#if FF_API_ARCH_BFIN -#define SWS_CPU_CAPS_BFIN 0x0100 -#endif -#define SWS_CPU_CAPS_SSE2 0x0200 -#endif - #define SWS_MAX_REDUCE_CUTOFF 0.002 #define SWS_CS_ITU709 1 diff --git a/libswscale/version.h b/libswscale/version.h index fdde657..db74da1 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -46,11 +46,4 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_SWS_CPU_CAPS -#define FF_API_SWS_CPU_CAPS(LIBSWSCALE_VERSION_MAJOR < 4) -#endif -#ifndef FF_API_ARCH_BFIN -#define FF_API_ARCH_BFIN (LIBSWSCALE_VERSION_MAJOR < 4) -#endif - #endif /* SWSCALE_VERSION_H */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '9d58639e270f7612874681e0ca30fa461e2667b7'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 15:58:52 2015 +0200| [cebe51a6255e04b8dcd15fcbab359ed00dbb3ab1] | committer: Hendrik Leppkes Merge commit '9d58639e270f7612874681e0ca30fa461e2667b7' * commit '9d58639e270f7612874681e0ca30fa461e2667b7': sws: Drop deprecated SWS_CPU_CAPS defines Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cebe51a6255e04b8dcd15fcbab359ed00dbb3ab1 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavr: Drop deprecated context reinitialization if resampling was not enabled
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:18 2015 +0100| [11b2eed43e91b35b8295ed47115cae2e29bd687d] |
committer: Vittorio Giovara
lavr: Drop deprecated context reinitialization if resampling was not enabled
Deprecated in 11/2012.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11b2eed43e91b35b8295ed47115cae2e29bd687d
---
libavresample/resample.c | 54 --
libavresample/version.h |4
2 files changed, 58 deletions(-)
diff --git a/libavresample/resample.c b/libavresample/resample.c
index 86a761b..b307487 100644
--- a/libavresample/resample.c
+++ b/libavresample/resample.c
@@ -243,62 +243,8 @@ int avresample_set_compensation(AVAudioResampleContext
*avr, int sample_delta,
return AVERROR(EINVAL);
if (!avr->resample_needed) {
-#if FF_API_RESAMPLE_CLOSE_OPEN
-/* if resampling was not enabled previously, re-initialize the
- AVAudioResampleContext and force resampling */
-int fifo_samples;
-int restore_matrix = 0;
-double matrix[AVRESAMPLE_MAX_CHANNELS * AVRESAMPLE_MAX_CHANNELS] = { 0
};
-
-/* buffer any remaining samples in the output FIFO before closing */
-fifo_samples = av_audio_fifo_size(avr->out_fifo);
-if (fifo_samples > 0) {
-fifo_buf = ff_audio_data_alloc(avr->out_channels, fifo_samples,
- avr->out_sample_fmt, NULL);
-if (!fifo_buf)
-return AVERROR(EINVAL);
-ret = ff_audio_data_read_from_fifo(avr->out_fifo, fifo_buf,
- fifo_samples);
-if (ret < 0)
-goto reinit_fail;
-}
-/* save the channel mixing matrix */
-if (avr->am) {
-ret = avresample_get_matrix(avr, matrix, AVRESAMPLE_MAX_CHANNELS);
-if (ret < 0)
-goto reinit_fail;
-restore_matrix = 1;
-}
-
-/* close the AVAudioResampleContext */
-avresample_close(avr);
-
-avr->force_resampling = 1;
-
-/* restore the channel mixing matrix */
-if (restore_matrix) {
-ret = avresample_set_matrix(avr, matrix, AVRESAMPLE_MAX_CHANNELS);
-if (ret < 0)
-goto reinit_fail;
-}
-
-/* re-open the AVAudioResampleContext */
-ret = avresample_open(avr);
-if (ret < 0)
-goto reinit_fail;
-
-/* restore buffered samples to the output FIFO */
-if (fifo_samples > 0) {
-ret = ff_audio_data_add_to_fifo(avr->out_fifo, fifo_buf, 0,
-fifo_samples);
-if (ret < 0)
-goto reinit_fail;
-ff_audio_data_free(&fifo_buf);
-}
-#else
av_log(avr, AV_LOG_ERROR, "Unable to set resampling compensation\n");
return AVERROR(EINVAL);
-#endif
}
c = avr->resample;
c->compensation_distance = compensation_distance;
diff --git a/libavresample/version.h b/libavresample/version.h
index 34623a1..857d59c 100644
--- a/libavresample/version.h
+++ b/libavresample/version.h
@@ -47,8 +47,4 @@
* the public API and may change, break or disappear at any time.
*/
-#ifndef FF_API_RESAMPLE_CLOSE_OPEN
-#define FF_API_RESAMPLE_CLOSE_OPEN (LIBAVRESAMPLE_VERSION_MAJOR < 3)
-#endif
-
#endif /* AVRESAMPLE_VERSION_H */
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '11b2eed43e91b35b8295ed47115cae2e29bd687d'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 15:59:40 2015 +0200| [e2adb00ec587dd48746b0d24648005d22c91423c] | committer: Hendrik Leppkes Merge commit '11b2eed43e91b35b8295ed47115cae2e29bd687d' * commit '11b2eed43e91b35b8295ed47115cae2e29bd687d': lavr: Drop deprecated context reinitialization if resampling was not enabled Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e2adb00ec587dd48746b0d24648005d22c91423c --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '86e5056575f55f070609dd3926605302f7d2280e'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 16:01:24 2015 +0200| [2751d5f0ba2e4da18fe72d91d317423f1662dd9b] | committer: Hendrik Leppkes Merge commit '86e5056575f55f070609dd3926605302f7d2280e' * commit '86e5056575f55f070609dd3926605302f7d2280e': lavfi: Drop deprecated public AVFilterPad struct Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2751d5f0ba2e4da18fe72d91d317423f1662dd9b --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavfi: Drop deprecated public AVFilterPad struct
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:19 2015 +0100| [86e5056575f55f070609dd3926605302f7d2280e] |
committer: Vittorio Giovara
lavfi: Drop deprecated public AVFilterPad struct
Deprecated in 06/2012.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86e5056575f55f070609dd3926605302f7d2280e
---
libavfilter/avfilter.h | 139
libavfilter/internal.h |2 -
libavfilter/version.h |3 --
3 files changed, 144 deletions(-)
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 57aa86d..af752ee 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -228,145 +228,6 @@ attribute_deprecated
void avfilter_unref_bufferp(AVFilterBufferRef **ref);
#endif
-#if FF_API_AVFILTERPAD_PUBLIC
-/**
- * A filter pad used for either input or output.
- *
- * @warning this struct will be removed from public API.
- * users should call avfilter_pad_get_name() and avfilter_pad_get_type()
- * to access the name and type fields; there should be no need to access
- * any other fields from outside of libavfilter.
- */
-struct AVFilterPad {
-/**
- * Pad name. The name is unique among inputs and among outputs, but an
- * input may have the same name as an output. This may be NULL if this
- * pad has no need to ever be referenced by name.
- */
-const char *name;
-
-/**
- * AVFilterPad type.
- */
-enum AVMediaType type;
-
-/**
- * Minimum required permissions on incoming buffers. Any buffer with
- * insufficient permissions will be automatically copied by the filter
- * system to a new buffer which provides the needed access permissions.
- *
- * Input pads only.
- */
-attribute_deprecated int min_perms;
-
-/**
- * Permissions which are not accepted on incoming buffers. Any buffer
- * which has any of these permissions set will be automatically copied
- * by the filter system to a new buffer which does not have those
- * permissions. This can be used to easily disallow buffers with
- * AV_PERM_REUSE.
- *
- * Input pads only.
- */
-attribute_deprecated int rej_perms;
-
-/**
- * @deprecated unused
- */
-int (*start_frame)(AVFilterLink *link, AVFilterBufferRef *picref);
-
-/**
- * Callback function to get a video buffer. If NULL, the filter system will
- * use avfilter_default_get_video_buffer().
- *
- * Input video pads only.
- */
-AVFrame *(*get_video_buffer)(AVFilterLink *link, int w, int h);
-
-/**
- * Callback function to get an audio buffer. If NULL, the filter system
will
- * use avfilter_default_get_audio_buffer().
- *
- * Input audio pads only.
- */
-AVFrame *(*get_audio_buffer)(AVFilterLink *link, int nb_samples);
-
-/**
- * @deprecated unused
- */
-int (*end_frame)(AVFilterLink *link);
-
-/**
- * @deprecated unused
- */
-int (*draw_slice)(AVFilterLink *link, int y, int height, int slice_dir);
-
-/**
- * Filtering callback. This is where a filter receives a frame with
- * audio/video data and should do its processing.
- *
- * Input pads only.
- *
- * @return >= 0 on success, a negative AVERROR on error. This function
- * must ensure that samplesref is properly unreferenced on error if it
- * hasn't been passed on to another filter.
- */
-int (*filter_frame)(AVFilterLink *link, AVFrame *frame);
-
-/**
- * Frame poll callback. This returns the number of immediately available
- * samples. It should return a positive value if the next request_frame()
- * is guaranteed to return one frame (with no delay).
- *
- * Defaults to just calling the source poll_frame() method.
- *
- * Output pads only.
- */
-int (*poll_frame)(AVFilterLink *link);
-
-/**
- * Frame request callback. A call to this should result in at least one
- * frame being output over the given link. This should return zero on
- * success, and another value on error.
- *
- * Output pads only.
- */
-int (*request_frame)(AVFilterLink *link);
-
-/**
- * Link configuration callback.
- *
- * For output pads, this should set the link properties such as
- * width/height. This should NOT set the format property - that is
- * negotiated between filters by the filter system using the
- * query_formats() callback before this function is called.
- *
- * For input pads, this should check the properties of the link, and update
- * the filter's internal state as necessary.
- *
- * For both input and output filters, this should return zero on success,
- * and another value on error.
- */
-int (*config_props)(AVFilterLink *link);
-
-/**
- * The filter expects a fifo to be inserted on its input link,
- * typically because it has a delay.
- *
- * input pads only.
- */
-
[FFmpeg-cvslog] lavfi: Drop deprecated *_count suffixed variables
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:20 2015 +0100| [e65e4cbbda03ca3c9087f069c9867d518415fca1] |
committer: Vittorio Giovara
lavfi: Drop deprecated *_count suffixed variables
Deprecated in 06/2012.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e65e4cbbda03ca3c9087f069c9867d518415fca1
---
libavfilter/avfilter.c |6 --
libavfilter/avfilter.h | 15 ---
libavfilter/avfiltergraph.c | 12
libavfilter/internal.h | 10 --
libavfilter/version.h |3 ---
5 files changed, 46 deletions(-)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 8ede145..64b2645 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -445,12 +445,6 @@ AVFilterContext *ff_filter_alloc(const AVFilter *filter,
const char *inst_name)
if (!ret->outputs)
goto err;
}
-#if FF_API_FOO_COUNT
-FF_DISABLE_DEPRECATION_WARNINGS
-ret->output_count = ret->nb_outputs;
-ret->input_count = ret->nb_inputs;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
return ret;
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index af752ee..5f19697 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -429,16 +429,10 @@ struct AVFilterContext {
AVFilterPad *input_pads; ///< array of input pads
AVFilterLink **inputs; ///< array of pointers to input links
-#if FF_API_FOO_COUNT
-attribute_deprecated unsigned input_count; ///< @deprecated use nb_inputs
-#endif
unsignednb_inputs; ///< number of input pads
AVFilterPad *output_pads; ///< array of output pads
AVFilterLink **outputs; ///< array of pointers to output links
-#if FF_API_FOO_COUNT
-attribute_deprecated unsigned output_count; ///< @deprecated use nb_outputs
-#endif
unsignednb_outputs; ///< number of output pads
void *priv; ///< private data for use by the filter
@@ -799,20 +793,11 @@ typedef int (avfilter_execute_func)(AVFilterContext *ctx,
avfilter_action_func *
typedef struct AVFilterGraph {
const AVClass *av_class;
-#if FF_API_FOO_COUNT
-attribute_deprecated
-unsigned filter_count;
-#endif
AVFilterContext **filters;
-#if !FF_API_FOO_COUNT
unsigned nb_filters;
-#endif
char *scale_sws_opts; ///< sws options to use for the auto-inserted scale
filters
char *resample_lavr_opts; ///< libavresample options to use for the
auto-inserted resample filters
-#if FF_API_FOO_COUNT
-unsigned nb_filters;
-#endif
/**
* Type of multithreading allowed for filters in this graph. A combination
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 0fc385c..6832664 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -127,12 +127,6 @@ int avfilter_graph_add_filter(AVFilterGraph *graph,
AVFilterContext *filter)
graph->filters = filters;
graph->filters[graph->nb_filters++] = filter;
-#if FF_API_FOO_COUNT
-FF_DISABLE_DEPRECATION_WARNINGS
-graph->filter_count = graph->nb_filters;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
filter->graph = graph;
return 0;
@@ -193,12 +187,6 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph
*graph,
graph->filters = filters;
graph->filters[graph->nb_filters++] = s;
-#if FF_API_FOO_COUNT
-FF_DISABLE_DEPRECATION_WARNINGS
-graph->filter_count = graph->nb_filters;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
s->graph = graph;
return s;
diff --git a/libavfilter/internal.h b/libavfilter/internal.h
index 9c330d7..b74e1ba 100644
--- a/libavfilter/internal.h
+++ b/libavfilter/internal.h
@@ -170,11 +170,6 @@ static inline void ff_insert_inpad(AVFilterContext *f,
unsigned index,
{
ff_insert_pad(index, &f->nb_inputs, offsetof(AVFilterLink, dstpad),
&f->input_pads, &f->inputs, p);
-#if FF_API_FOO_COUNT
-FF_DISABLE_DEPRECATION_WARNINGS
-f->input_count = f->nb_inputs;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
}
/** Insert a new output pad for the filter. */
@@ -183,11 +178,6 @@ static inline void ff_insert_outpad(AVFilterContext *f,
unsigned index,
{
ff_insert_pad(index, &f->nb_outputs, offsetof(AVFilterLink, srcpad),
&f->output_pads, &f->outputs, p);
-#if FF_API_FOO_COUNT
-FF_DISABLE_DEPRECATION_WARNINGS
-f->output_count = f->nb_outputs;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
}
/**
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 82381d1..16f2435 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -49,9 +49,6 @@
* the public API and may change, break or disappear at any time.
*/
-#ifndef FF_API_FOO_COUNT
-#define FF_API_FOO_COUNT(LIBAVFILTER_VERSION_MAJOR < 6)
-#endif
#ifndef FF_API_AVFILTERBUFFER
#define FF_API_AVFILTERBUFFER (LIBAVFILTER_VERSION_MAJOR < 6)
#endif
___
[FFmpeg-cvslog] Merge commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 16:11:22 2015 +0200| [43e2e172dfbd734947c30bdbfa8f19b7ca95576d] | committer: Hendrik Leppkes Merge commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1' * commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1': lavfi: Drop deprecated *_count suffixed variables Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43e2e172dfbd734947c30bdbfa8f19b7ca95576d --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/avf_showfreqs: Fix memleak of out frame
ffmpeg | branch: release/2.8 | Michael Niedermayer |
Sat Sep 5 15:35:37 2015 +0200| [8ca97b5e4f470cf24fac5e0599dd63c7af142c22] |
committer: Michael Niedermayer
avfilter/avf_showfreqs: Fix memleak of out frame
Fixes CID1322344
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8ca97b5e4f470cf24fac5e0599dd63c7af142c22
---
libavfilter/avf_showfreqs.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c
index 1bbaa92..c00e4d8 100644
--- a/libavfilter/avf_showfreqs.c
+++ b/libavfilter/avf_showfreqs.c
@@ -452,8 +452,10 @@ static int plot_freqs(AVFilterLink *inlink, AVFrame *in)
#define M(a, b) (sqrt((a) * (a) + (b) * (b)))
colors = av_strdup(s->colors);
-if (!colors)
+if (!colors) {
+av_frame_free(&out);
return AVERROR(ENOMEM);
+}
for (ch = 0; ch < s->nb_channels; ch++) {
uint8_t fg[4] = { 0xff, 0xff, 0xff, 0xff };
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavfi: Drop deprecated AVFilterBuffer* code
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:21 2015 +0100| [f6974fe651d29ef6eb68d66d73f7b6c011062aa0] |
committer: Vittorio Giovara
lavfi: Drop deprecated AVFilterBuffer* code
Deprecated in 11/2012.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6974fe651d29ef6eb68d66d73f7b6c011062aa0
---
libavfilter/Makefile |1 -
libavfilter/audio.c | 72 ---
libavfilter/avfilter.h | 219 --
libavfilter/buffer.c | 181 --
libavfilter/buffersink.c | 74
libavfilter/buffersink.h | 37
libavfilter/buffersrc.c | 108 ---
libavfilter/buffersrc.h | 15
libavfilter/internal.h |5 --
libavfilter/version.h|3 -
libavfilter/video.c | 47 --
11 files changed, 762 deletions(-)
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 7b94f22..a95a7eb 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -10,7 +10,6 @@ OBJS = allfilters.o
\
audio.o \
avfilter.o \
avfiltergraph.o \
- buffer.o \
buffersink.o \
buffersrc.o \
drawutils.o \
diff --git a/libavfilter/audio.c b/libavfilter/audio.c
index b332e9e..5fe9da9 100644
--- a/libavfilter/audio.c
+++ b/libavfilter/audio.c
@@ -66,75 +66,3 @@ AVFrame *ff_get_audio_buffer(AVFilterLink *link, int
nb_samples)
return ret;
}
-
-#if FF_API_AVFILTERBUFFER
-AVFilterBufferRef* avfilter_get_audio_buffer_ref_from_arrays(uint8_t **data,
- int linesize,int
perms,
- int nb_samples,
- enum
AVSampleFormat sample_fmt,
- uint64_t
channel_layout)
-{
-int planes;
-AVFilterBuffer*samples= av_mallocz(sizeof(*samples));
-AVFilterBufferRef *samplesref = av_mallocz(sizeof(*samplesref));
-
-if (!samples || !samplesref)
-goto fail;
-
-samplesref->buf = samples;
-samplesref->buf->free = ff_avfilter_default_free_buffer;
-if (!(samplesref->audio = av_mallocz(sizeof(*samplesref->audio
-goto fail;
-
-samplesref->audio->nb_samples = nb_samples;
-samplesref->audio->channel_layout = channel_layout;
-samplesref->audio->planar = av_sample_fmt_is_planar(sample_fmt);
-
-planes = samplesref->audio->planar ?
av_get_channel_layout_nb_channels(channel_layout) : 1;
-
-/* make sure the buffer gets read permission or it's useless for output */
-samplesref->perms = perms | AV_PERM_READ;
-
-samples->refcount = 1;
-samplesref->type = AVMEDIA_TYPE_AUDIO;
-samplesref->format = sample_fmt;
-
-memcpy(samples->data, data,
- FFMIN(FF_ARRAY_ELEMS(samples->data),
planes)*sizeof(samples->data[0]));
-memcpy(samplesref->data, samples->data, sizeof(samples->data));
-
-samples->linesize[0] = samplesref->linesize[0] = linesize;
-
-if (planes > FF_ARRAY_ELEMS(samples->data)) {
-samples-> extended_data = av_mallocz(sizeof(*samples->extended_data)
*
- planes);
-samplesref->extended_data =
av_mallocz(sizeof(*samplesref->extended_data) *
- planes);
-
-if (!samples->extended_data || !samplesref->extended_data)
-goto fail;
-
-memcpy(samples-> extended_data, data, sizeof(*data)*planes);
-memcpy(samplesref->extended_data, data, sizeof(*data)*planes);
-} else {
-samples->extended_data= samples->data;
-samplesref->extended_data = samplesref->data;
-}
-
-samplesref->pts = AV_NOPTS_VALUE;
-
-return samplesref;
-
-fail:
-if (samples && samples->extended_data != samples->data)
-av_freep(&samples->extended_data);
-if (samplesref) {
-av_freep(&samplesref->audio);
-if (samplesref->extended_data != samplesref->data)
-av_freep(&samplesref->extended_data);
-}
-av_freep(&samplesref);
-av_freep(&samples);
-return NULL;
-}
-#endif
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 5f19697..9dbfeea 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -66,168 +66,6 @@ typedef struct AVFilterLinkAVFilterLink;
typedef struct AVFilterPad AVFilterPad;
typedef struct AVFilterFormats
[FFmpeg-cvslog] Merge commit 'f6974fe651d29ef6eb68d66d73f7b6c011062aa0'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 16:22:03 2015 +0200| [033764e015e33b9ce9583317092337367b3fea2b] | committer: Hendrik Leppkes Merge commit 'f6974fe651d29ef6eb68d66d73f7b6c011062aa0' * commit 'f6974fe651d29ef6eb68d66d73f7b6c011062aa0': lavfi: Drop deprecated AVFilterBuffer* code Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=033764e015e33b9ce9583317092337367b3fea2b --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Remove left-over FF_API_AVFILTERBUFFER cruft
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 16:27:19 2015 +0200| [144fb06806664d4f3bc681ed1408383baeb515f4] | committer: Hendrik Leppkes Remove left-over FF_API_AVFILTERBUFFER cruft > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=144fb06806664d4f3bc681ed1408383baeb515f4 --- doc/examples/filtering_audio.c |1 - doc/examples/filtering_video.c |1 - doc/examples/transcoding.c |1 - ffmpeg.c |1 - ffplay.c |1 - libavfilter/Makefile |7 +- libavfilter/allfilters.c |5 -- libavfilter/asrc_abuffer.h | 91 -- libavfilter/avcodec.c | 139 libavfilter/avcodec.h | 69 libavfilter/avfilter.h | 15 - libavfilter/buffersrc.c|1 - libavfilter/internal.h | 10 --- libavfilter/src_movie.c|1 - 14 files changed, 1 insertion(+), 342 deletions(-) diff --git a/doc/examples/filtering_audio.c b/doc/examples/filtering_audio.c index f5cb8eb..6c74ec3 100644 --- a/doc/examples/filtering_audio.c +++ b/doc/examples/filtering_audio.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/doc/examples/filtering_video.c b/doc/examples/filtering_video.c index 5685380..5600572 100644 --- a/doc/examples/filtering_video.c +++ b/doc/examples/filtering_video.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/doc/examples/transcoding.c b/doc/examples/transcoding.c index 59b113e..20c9e27 100644 --- a/doc/examples/transcoding.c +++ b/doc/examples/transcoding.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/ffmpeg.c b/ffmpeg.c index 2b3085a..d9b8c0b 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -64,7 +64,6 @@ #include "libavcodec/mathops.h" #include "libavformat/os_support.h" -# include "libavfilter/avcodec.h" # include "libavfilter/avfilter.h" # include "libavfilter/buffersrc.h" # include "libavfilter/buffersink.h" diff --git a/ffplay.c b/ffplay.c index 74458fd..d302793 100644 --- a/ffplay.c +++ b/ffplay.c @@ -48,7 +48,6 @@ #include "libswresample/swresample.h" #if CONFIG_AVFILTER -# include "libavfilter/avcodec.h" # include "libavfilter/avfilter.h" # include "libavfilter/buffersink.h" # include "libavfilter/buffersrc.h" diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 12280a8..a8b3a4d 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -2,9 +2,7 @@ include $(SUBDIR)../config.mak NAME = avfilter -HEADERS = asrc_abuffer.h\ - avcodec.h \ - avfilter.h\ +HEADERS = avfilter.h\ avfiltergraph.h \ buffersink.h \ buffersrc.h \ @@ -25,9 +23,6 @@ OBJS = allfilters.o \ transform.o \ video.o \ - -OBJS-$(CONFIG_AVCODEC) += avcodec.o - OBJS-$(CONFIG_ACROSSFADE_FILTER) += af_afade.o OBJS-$(CONFIG_ADELAY_FILTER) += af_adelay.o OBJS-$(CONFIG_AECHO_FILTER) += af_aecho.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index b7b3807..427585f 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -289,11 +289,6 @@ void avfilter_register_all(void) REGISTER_FILTER(AMOVIE, amovie, avsrc); REGISTER_FILTER(MOVIE, movie, avsrc); -#if FF_API_AVFILTERBUFFER -REGISTER_FILTER_UNCONDITIONAL(vsink_ffbuffersink); -REGISTER_FILTER_UNCONDITIONAL(asink_ffabuffersink); -#endif - /* those filters are part of public or internal API => registered * unconditionally */ REGISTER_FILTER_UNCONDITIONAL(asrc_abuffer); diff --git a/libavfilter/asrc_abuffer.h b/libavfilter/asrc_abuffer.h deleted file mode 100644 index aa34461..000 --- a/libavfilter/asrc_abuffer.h +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR
[FFmpeg-cvslog] lavc: Drop deprecated request_channels related functions
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:22 2015 +0100| [dc70c19476e76f1118df73b5d97cc76f0e5f6f6c] |
committer: Vittorio Giovara
lavc: Drop deprecated request_channels related functions
Deprecated in 04/2011.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc70c19476e76f1118df73b5d97cc76f0e5f6f6c
---
libavcodec/aac_ac3_parser.c |8
libavcodec/ac3dec.c |8
libavcodec/avcodec.h| 10 --
libavcodec/dcadec.c | 14 --
libavcodec/mlp_parser.c | 22 --
libavcodec/mlpdec.c | 13 -
libavcodec/options_table.h |3 ---
libavcodec/version.h|3 ---
8 files changed, 81 deletions(-)
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index d3da9b7..806a826 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -84,14 +84,6 @@ get_next:
avctx->sample_rate = s->sample_rate;
/* (E-)AC-3: allow downmixing to stereo or mono */
-#if FF_API_REQUEST_CHANNELS
-FF_DISABLE_DEPRECATION_WARNINGS
-if (avctx->request_channels == 1)
-avctx->request_channel_layout = AV_CH_LAYOUT_MONO;
-else if (avctx->request_channels == 2)
-avctx->request_channel_layout = AV_CH_LAYOUT_STEREO;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
if (s->channels > 1 &&
avctx->request_channel_layout == AV_CH_LAYOUT_MONO) {
avctx->channels = 1;
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index ca5e441..97ce287 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -190,14 +190,6 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
/* allow downmixing to stereo or mono */
-#if FF_API_REQUEST_CHANNELS
-FF_DISABLE_DEPRECATION_WARNINGS
-if (avctx->request_channels == 1)
-avctx->request_channel_layout = AV_CH_LAYOUT_MONO;
-else if (avctx->request_channels == 2)
-avctx->request_channel_layout = AV_CH_LAYOUT_STEREO;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
if (avctx->channels > 1 &&
avctx->request_channel_layout == AV_CH_LAYOUT_MONO)
avctx->channels = 1;
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5bf9833..e9aba6a 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2063,16 +2063,6 @@ typedef struct AVCodecContext {
*/
int cutoff;
-#if FF_API_REQUEST_CHANNELS
-/**
- * Decoder should decode to this many channels if it can (0 for default)
- * - encoding: unused
- * - decoding: Set by user.
- * @deprecated Deprecated in favor of request_channel_layout.
- */
-attribute_deprecated int request_channels;
-#endif
-
/**
* Audio channel layout.
* - encoding: set by user.
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 8fdd03c..abf762d 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -1307,15 +1307,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void
*data,
s->xch_disable = 1;
}
-#if FF_API_REQUEST_CHANNELS
-FF_DISABLE_DEPRECATION_WARNINGS
-if (s->xch_present && !s->xch_disable &&
-(!avctx->request_channels ||
- avctx->request_channels > num_core_channels + !!s->lfe)) {
-FF_ENABLE_DEPRECATION_WARNINGS
-#else
if (s->xch_present && !s->xch_disable) {
-#endif
avctx->channel_layout |= AV_CH_BACK_CENTER;
if (s->lfe) {
avctx->channel_layout |= AV_CH_LOW_FREQUENCY;
@@ -1523,12 +1515,6 @@ static av_cold int dca_decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
/* allow downmixing to stereo */
-#if FF_API_REQUEST_CHANNELS
-FF_DISABLE_DEPRECATION_WARNINGS
-if (avctx->request_channels == 2)
-avctx->request_channel_layout = AV_CH_LAYOUT_STEREO;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
if (avctx->channels > 2 &&
avctx->request_channel_layout == AV_CH_LAYOUT_STEREO)
avctx->channels = 2;
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c
index 0c7d4a2..e8fb4f5 100644
--- a/libavcodec/mlp_parser.c
+++ b/libavcodec/mlp_parser.c
@@ -345,15 +345,6 @@ static int mlp_parse(AVCodecParserContext *s,
if (mh.stream_type == 0xbb) {
/* MLP stream */
-#if FF_API_REQUEST_CHANNELS
-FF_DISABLE_DEPRECATION_WARNINGS
-if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
-mh.num_substreams > 1) {
-avctx->channels = 2;
-avctx->channel_layout = AV_CH_LAYOUT_STEREO;
-} else
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
if (avctx->request_channel_layout &&
(avctx->request_channel_layout & AV_CH_LAYOUT_STEREO) ==
avctx->request_channel_layout &&
@@ -366,19 +357,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
} else
[FFmpeg-cvslog] Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 16:42:44 2015 +0200| [b27ddffbfb29f456d43c2f155eef5230b940a48b] | committer: Hendrik Leppkes Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c' * commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c': lavc: Drop deprecated request_channels related functions Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b27ddffbfb29f456d43c2f155eef5230b940a48b --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Remove left-over FF_API_DESTRUCT_PACKET cruft
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5
16:51:53 2015 +0200| [83a5df54eae6dddea7c453fd25c45c7b9c148925] | committer:
Hendrik Leppkes
Remove left-over FF_API_DESTRUCT_PACKET cruft
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83a5df54eae6dddea7c453fd25c45c7b9c148925
---
ffmpeg.c |8 +---
libavcodec/avpacket.c | 13 +
libavcodec/utils.c | 15 ---
libavdevice/iec61883.c |5 -
libavformat/asfdec_f.c |5 -
libavformat/mux.c |5 -
libavformat/tee.c |8 +---
7 files changed, 3 insertions(+), 56 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index d9b8c0b..7609457 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -692,13 +692,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt,
OutputStream *ost)
&new_pkt.data, &new_pkt.size,
pkt->data, pkt->size,
pkt->flags & AV_PKT_FLAG_KEY);
-FF_DISABLE_DEPRECATION_WARNINGS
-if(a == 0 && new_pkt.data != pkt->data
-#if FF_API_DESTRUCT_PACKET
- && new_pkt.destruct
-#endif
- ) {
-FF_ENABLE_DEPRECATION_WARNINGS
+if(a == 0 && new_pkt.data != pkt->data) {
uint8_t *t = av_malloc(new_pkt.size +
AV_INPUT_BUFFER_PADDING_SIZE); //the new should be a subset of the old so
cannot overflow
if(t) {
memcpy(t, new_pkt.data, new_pkt.size);
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 7b2df14..32fa51f 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -208,13 +208,7 @@ int av_dup_packet(AVPacket *pkt)
{
AVPacket tmp_pkt;
-FF_DISABLE_DEPRECATION_WARNINGS
-if (!pkt->buf && pkt->data
-#if FF_API_DESTRUCT_PACKET
-&& !pkt->destruct
-#endif
-) {
-FF_ENABLE_DEPRECATION_WARNINGS
+if (!pkt->buf && pkt->data) {
tmp_pkt = *pkt;
return copy_packet_data(pkt, &tmp_pkt, 1);
}
@@ -330,11 +324,6 @@ int av_packet_merge_side_data(AVPacket *pkt){
return AVERROR(ENOMEM);
pkt->buf = buf;
pkt->data = p = buf->data;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
-pkt->destruct = dummy_destruct_packet;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
pkt->size = size - AV_INPUT_BUFFER_PADDING_SIZE;
bytestream_put_buffer(&p, old.data, old.size);
for (i=old.side_data_elems-1; i>=0; i--) {
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 729df11..03a4a5e 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1797,11 +1797,6 @@ int ff_alloc_packet2(AVCodecContext *avctx, AVPacket
*avpkt, int64_t size, int64
av_fast_padded_malloc(&avctx->internal->byte_buffer,
&avctx->internal->byte_buffer_size, size);
avpkt->data = avctx->internal->byte_buffer;
avpkt->size = avctx->internal->byte_buffer_size;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
-avpkt->destruct = NULL;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
}
}
@@ -1972,11 +1967,6 @@ int attribute_align_arg
avcodec_encode_audio2(AVCodecContext *avctx,
}
avpkt->buf = user_pkt.buf;
avpkt->data = user_pkt.data;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
-avpkt->destruct = user_pkt.destruct;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
} else {
if (av_dup_packet(avpkt) < 0) {
ret = AVERROR(ENOMEM);
@@ -2197,11 +2187,6 @@ int attribute_align_arg
avcodec_encode_video2(AVCodecContext *avctx,
}
avpkt->buf = user_pkt.buf;
avpkt->data = user_pkt.data;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
-avpkt->destruct = user_pkt.destruct;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
} else {
if (av_dup_packet(avpkt) < 0) {
ret = AVERROR(ENOMEM);
diff --git a/libavdevice/iec61883.c b/libavdevice/iec61883.c
index 8ee834e..c45ae9a 100644
--- a/libavdevice/iec61883.c
+++ b/libavdevice/iec61883.c
@@ -198,11 +198,6 @@ static int iec61883_parse_queue_dv(struct iec61883_data
*dv, AVPacket *pkt)
size = avpriv_dv_produce_packet(dv->dv_demux, pkt,
packet->buf, packet->len, -1);
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
-pkt->destruct = av_destruct_packet;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
dv->queue_first = packet->next;
av_free(packet);
dv->packets--;
diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c
index a30b7d7..7c31cfa 100644
--- a/libavformat/asfdec_f.c
+++ b/libavformat/asfdec_f.c
@@ -1420,11 +1420,6 @@ static int asf_parse_packet(AVFormatContext *s,
AVIOContext *pb, AVPacket *pkt)
}
asf_st->frag_offset = 0;
*pkt= as
[FFmpeg-cvslog] lavc: Drop deprecated destruct_packet related functions
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:23 2015 +0100| [01bcc2d5c23fa757d163530abb396fd02f1be7c8] |
committer: Vittorio Giovara
lavc: Drop deprecated destruct_packet related functions
Deprecated in 10/2012.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01bcc2d5c23fa757d163530abb396fd02f1be7c8
---
libavcodec/avcodec.h | 16 +-
libavcodec/avpacket.c | 56 +
libavcodec/utils.c| 10 -
libavcodec/version.h |3 ---
libavdevice/v4l2.c| 12 ---
libavformat/avidec.c | 13
libavformat/mux.c |5 -
libavformat/mxg.c | 10 -
libavformat/psxstr.c |5 -
libavformat/rmdec.c |5 -
libavformat/utils.c |6 --
libavformat/yop.c |5 -
12 files changed, 2 insertions(+), 144 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e9aba6a..1d18c36 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1209,12 +1209,7 @@ typedef struct AVPacket {
* Equals next_pts - this_pts in presentation order.
*/
int duration;
-#if FF_API_DESTRUCT_PACKET
-attribute_deprecated
-void (*destruct)(struct AVPacket *);
-attribute_deprecated
-void *priv;
-#endif
+
int64_t pos;///< byte position in stream, -1
if unknown
/**
@@ -3576,15 +3571,6 @@ void avsubtitle_free(AVSubtitle *sub);
* @{
*/
-#if FF_API_DESTRUCT_PACKET
-/**
- * Default packet destructor.
- * @deprecated use the AVBuffer API instead
- */
-attribute_deprecated
-void av_destruct_packet(AVPacket *pkt);
-#endif
-
/**
* Initialize optional fields of a packet with default values.
*
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index bad379f..dfaf045 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -27,22 +27,6 @@
#include "libavutil/mathematics.h"
#include "libavutil/mem.h"
#include "avcodec.h"
-#if FF_API_DESTRUCT_PACKET
-
-void av_destruct_packet(AVPacket *pkt)
-{
-av_free(pkt->data);
-pkt->data = NULL;
-pkt->size = 0;
-}
-
-/* a dummy destruct callback for the callers that assume AVPacket.destruct ==
- * NULL => static data */
-static void dummy_destruct_packet(AVPacket *pkt)
-{
-av_assert0(0);
-}
-#endif
void av_init_packet(AVPacket *pkt)
{
@@ -53,11 +37,6 @@ void av_init_packet(AVPacket *pkt)
pkt->convergence_duration = 0;
pkt->flags= 0;
pkt->stream_index = 0;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
-pkt->destruct = NULL;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
pkt->buf = NULL;
pkt->side_data= NULL;
pkt->side_data_elems = 0;
@@ -89,11 +68,6 @@ int av_new_packet(AVPacket *pkt, int size)
pkt->buf = buf;
pkt->data = buf->data;
pkt->size = size;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
-pkt->destruct = dummy_destruct_packet;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
return 0;
}
@@ -126,11 +100,6 @@ int av_grow_packet(AVPacket *pkt, int grow_by)
if (!pkt->buf)
return AVERROR(ENOMEM);
memcpy(pkt->buf->data, pkt->data, FFMIN(pkt->size, pkt->size +
grow_by));
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
-pkt->destruct = dummy_destruct_packet;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
}
pkt->data = pkt->buf->data;
pkt->size += grow_by;
@@ -151,11 +120,6 @@ int av_packet_from_data(AVPacket *pkt, uint8_t *data, int
size)
pkt->data = data;
pkt->size = size;
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
-pkt->destruct = dummy_destruct_packet;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
return 0;
}
@@ -191,23 +155,12 @@ int av_dup_packet(AVPacket *pkt)
{
AVPacket tmp_pkt;
-FF_DISABLE_DEPRECATION_WARNINGS
-if (!pkt->buf && pkt->data
-#if FF_API_DESTRUCT_PACKET
-&& !pkt->destruct
-#endif
-) {
-FF_ENABLE_DEPRECATION_WARNINGS
+if (!pkt->buf && pkt->data) {
tmp_pkt = *pkt;
pkt->data = NULL;
pkt->side_data = NULL;
DUP_DATA(pkt->data, tmp_pkt.data, pkt->size, 1, ALLOC_BUF);
-#if FF_API_DESTRUCT_PACKET
-FF_DISABLE_DEPRECATION_WARNINGS
-pkt->destruct = dummy_destruct_packet;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
if (pkt->side_data_elems) {
int i;
@@ -243,15 +196,8 @@ void av_packet_free_side_data(AVPacket *pkt)
void av_free_packet(AVPacket *pkt)
{
if (pkt) {
-FF_DISABLE_DEPRECATION_WARNINGS
if (pkt->buf)
av_buffer_unref(&pkt->buf);
-#if FF_API_DESTRUCT_PACKET
-else if (pkt->destruct)
-pkt->destruct(pkt);
-pkt->destruct = NULL;
-#endif
-FF_ENABLE_DEPRECATION_WARNINGS
pkt->data= NULL;
pkt->size= 0;
diff --git a/libavcodec/utils.c
[FFmpeg-cvslog] Merge commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 16:50:09 2015 +0200| [87c88122703f2befcf96383d05bdf14373c22df9] | committer: Hendrik Leppkes Merge commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8' * commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8': lavc: Drop deprecated destruct_packet related functions Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87c88122703f2befcf96383d05bdf14373c22df9 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '9f90b24877016e7140b9b14e4b1acee663bb6d8a'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 16:59:23 2015 +0200| [4eb86b83a407faef20e9b243f341daa4e88728ef] | committer: Hendrik Leppkes Merge commit '9f90b24877016e7140b9b14e4b1acee663bb6d8a' * commit '9f90b24877016e7140b9b14e4b1acee663bb6d8a': lavc: Drop deprecated get_buffer related functions Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4eb86b83a407faef20e9b243f341daa4e88728ef --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc: Drop deprecated get_buffer related functions
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:24 2015 +0100| [9f90b24877016e7140b9b14e4b1acee663bb6d8a] |
committer: Vittorio Giovara
lavc: Drop deprecated get_buffer related functions
Deprecated in 11/2012.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f90b24877016e7140b9b14e4b1acee663bb6d8a
---
libavcodec/avcodec.h | 114 --
libavcodec/pthread_frame.c | 32 ++---
libavcodec/utils.c | 164
libavcodec/version.h |3 -
4 files changed, 5 insertions(+), 308 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1d18c36..8390bda 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1039,18 +1039,6 @@ typedef struct AVPanScan{
#define FF_QSCALE_TYPE_VP56 3
#endif
-#if FF_API_GET_BUFFER
-#define FF_BUFFER_TYPE_INTERNAL 1
-#define FF_BUFFER_TYPE_USER 2 ///< direct rendering buffers (image is
(de)allocated by user)
-#define FF_BUFFER_TYPE_SHARED 4 ///< Buffer from somewhere else; don't
deallocate image (data/base), all other tables are not shared.
-#define FF_BUFFER_TYPE_COPY 8 ///< Just a (modified) copy of some other
buffer, don't deallocate anything.
-
-#define FF_BUFFER_HINTS_VALID0x01 // Buffer hints value is meaningful (if
0 ignore).
-#define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
-#define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
-#define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
-#endif
-
/**
* The decoder will keep a reference to the frame and may reuse it later.
*/
@@ -2086,102 +2074,6 @@ typedef struct AVCodecContext {
*/
enum AVSampleFormat request_sample_fmt;
-#if FF_API_GET_BUFFER
-/**
- * Called at the beginning of each frame to get a buffer for it.
- *
- * The function will set AVFrame.data[], AVFrame.linesize[].
- * AVFrame.extended_data[] must also be set, but it should be the same as
- * AVFrame.data[] except for planar audio with more channels than can fit
- * in AVFrame.data[]. In that case, AVFrame.data[] shall still contain as
- * many data pointers as it can hold.
- *
- * if CODEC_CAP_DR1 is not set then get_buffer() must call
- * avcodec_default_get_buffer() instead of providing buffers allocated by
- * some other means.
- *
- * AVFrame.data[] should be 32- or 16-byte-aligned unless the CPU doesn't
- * need it. avcodec_default_get_buffer() aligns the output buffer properly,
- * but if get_buffer() is overridden then alignment considerations should
- * be taken into account.
- *
- * @see avcodec_default_get_buffer()
- *
- * Video:
- *
- * If pic.reference is set then the frame will be read later by libavcodec.
- * avcodec_align_dimensions2() should be used to find the required width
and
- * height, as they normally need to be rounded up to the next multiple of
16.
- *
- * If frame multithreading is used and thread_safe_callbacks is set,
- * it may be called from a different thread, but not from more than one at
- * once. Does not need to be reentrant.
- *
- * @see release_buffer(), reget_buffer()
- * @see avcodec_align_dimensions2()
- *
- * Audio:
- *
- * Decoders request a buffer of a particular size by setting
- * AVFrame.nb_samples prior to calling get_buffer(). The decoder may,
- * however, utilize only part of the buffer by setting AVFrame.nb_samples
- * to a smaller value in the output frame.
- *
- * Decoders cannot use the buffer after returning from
- * avcodec_decode_audio4(), so they will not call release_buffer(), as it
- * is assumed to be released immediately upon return. In some rare cases,
- * a decoder may need to call get_buffer() more than once in a single
- * call to avcodec_decode_audio4(). In that case, when get_buffer() is
- * called again after it has already been called once, the previously
- * acquired buffer is assumed to be released at that time and may not be
- * reused by the decoder.
- *
- * As a convenience, av_samples_get_buffer_size() and
- * av_samples_fill_arrays() in libavutil may be used by custom get_buffer()
- * functions to find the required data size and to fill data pointers and
- * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
- * since all planes must be the same size.
- *
- * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
- *
- * - encoding: unused
- * - decoding: Set by libavcodec, user can override.
- *
- * @deprecated use get_buffer2()
- */
-attribute_deprecated
-int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
-
-/**
- * Called to release buffers which were allocated with get_buffer.
- * A released buffer can be reused in get_buffer().
-
[FFmpeg-cvslog] lavc: Drop deprecated thread opaque and codec pkt
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:25 2015 +0100| [069713aa4b137781e270768d803b1f7456daa724] |
committer: Vittorio Giovara
lavc: Drop deprecated thread opaque and codec pkt
These fields were never part of the public API.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=069713aa4b137781e270768d803b1f7456daa724
---
libavcodec/avcodec.h | 16
libavcodec/version.h |6 --
2 files changed, 22 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8390bda..8eca49b 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2714,14 +2714,6 @@ typedef struct AVCodecContext {
*/
int (*execute2)(struct AVCodecContext *c, int (*func)(struct
AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret,
int count);
-#if FF_API_THREAD_OPAQUE
-/**
- * @deprecated this field should not be used from outside of lavc
- */
-attribute_deprecated
-void *thread_opaque;
-#endif
-
/**
* noise vs. sse weight for the nsse comparsion function
* - encoding: Set by user.
@@ -2866,14 +2858,6 @@ typedef struct AVCodecContext {
int error_rate;
#endif
-#if FF_API_CODEC_PKT
-/**
- * @deprecated this field is not supposed to be accessed from outside lavc
- */
-attribute_deprecated
-AVPacket *pkt;
-#endif
-
/**
* VBV delay coded in the last frame (in periods of a 27 MHz clock).
* Used for compliant TS muxing.
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 2d26d4f..d14b1c0 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -81,12 +81,6 @@
#ifndef FF_API_ASPECT_EXTENDED
#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 57)
#endif
-#ifndef FF_API_THREAD_OPAQUE
-#define FF_API_THREAD_OPAQUE (LIBAVCODEC_VERSION_MAJOR < 57)
-#endif
-#ifndef FF_API_CODEC_PKT
-#define FF_API_CODEC_PKT (LIBAVCODEC_VERSION_MAJOR < 57)
-#endif
#ifndef FF_API_ARCH_ALPHA
#define FF_API_ARCH_ALPHA(LIBAVCODEC_VERSION_MAJOR < 57)
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '069713aa4b137781e270768d803b1f7456daa724'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 17:03:44 2015 +0200| [7f6b794da051ff4e4235bbc2b84469ff2807a453] | committer: Hendrik Leppkes Merge commit '069713aa4b137781e270768d803b1f7456daa724' * commit '069713aa4b137781e270768d803b1f7456daa724': lavc: Drop deprecated thread opaque and codec pkt Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f6b794da051ff4e4235bbc2b84469ff2807a453 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 17:05:46 2015 +0200| [41194f065c8e9b138db069417494e2f845c7b275] | committer: Hendrik Leppkes Merge commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798' * commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798': lavc: Drop deprecated deinterlace module Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41194f065c8e9b138db069417494e2f845c7b275 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc: Drop deprecated deinterlace module
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:26 2015 +0100| [cad40a3833ad81a352e7657ec6f7d637cea3b798] |
committer: Vittorio Giovara
lavc: Drop deprecated deinterlace module
Deprecated in 03/2013.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cad40a3833ad81a352e7657ec6f7d637cea3b798
---
libavcodec/avcodec.h | 10 ---
libavcodec/imgconvert.c| 175
libavcodec/imgconvert.h| 16
libavcodec/version.h |3 -
libavcodec/x86/Makefile|4 -
libavcodec/x86/deinterlace.asm | 82 ---
6 files changed, 290 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8eca49b..e4e656c 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4227,16 +4227,6 @@ int avpicture_layout(const AVPicture* src, enum
AVPixelFormat pix_fmt,
*/
int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
-#if FF_API_DEINTERLACE
-/**
- * deinterlace - if not supported return -1
- *
- * @deprecated - use yadif (in libavfilter) instead
- */
-attribute_deprecated
-int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
- enum AVPixelFormat pix_fmt, int width, int height);
-#endif
/**
* Copy image src to dst. Wraps av_picture_data_copy() above.
*/
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 0741e6e..c9bf6a9 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -335,178 +335,3 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src,
int height, int width,
}
return 0;
}
-
-#if FF_API_DEINTERLACE
-
-#if HAVE_MMX_EXTERNAL
-#define deinterlace_line_inplace ff_deinterlace_line_inplace_mmx
-#define deinterlace_line ff_deinterlace_line_mmx
-#else
-#define deinterlace_line_inplace deinterlace_line_inplace_c
-#define deinterlace_line deinterlace_line_c
-
-/* filter parameters: [-1 4 2 4 -1] // 8 */
-static void deinterlace_line_c(uint8_t *dst,
- const uint8_t *lum_m4, const uint8_t *lum_m3,
- const uint8_t *lum_m2, const uint8_t *lum_m1,
- const uint8_t *lum,
- int size)
-{
-const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
-int sum;
-
-for(;size > 0;size--) {
-sum = -lum_m4[0];
-sum += lum_m3[0] << 2;
-sum += lum_m2[0] << 1;
-sum += lum_m1[0] << 2;
-sum += -lum[0];
-dst[0] = cm[(sum + 4) >> 3];
-lum_m4++;
-lum_m3++;
-lum_m2++;
-lum_m1++;
-lum++;
-dst++;
-}
-}
-
-static void deinterlace_line_inplace_c(uint8_t *lum_m4, uint8_t *lum_m3,
- uint8_t *lum_m2, uint8_t *lum_m1,
- uint8_t *lum, int size)
-{
-const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
-int sum;
-
-for(;size > 0;size--) {
-sum = -lum_m4[0];
-sum += lum_m3[0] << 2;
-sum += lum_m2[0] << 1;
-lum_m4[0]=lum_m2[0];
-sum += lum_m1[0] << 2;
-sum += -lum[0];
-lum_m2[0] = cm[(sum + 4) >> 3];
-lum_m4++;
-lum_m3++;
-lum_m2++;
-lum_m1++;
-lum++;
-}
-}
-#endif /* !HAVE_MMX_EXTERNAL */
-
-/* deinterlacing : 2 temporal taps, 3 spatial taps linear filter. The
- top field is copied as is, but the bottom field is deinterlaced
- against the top field. */
-static void deinterlace_bottom_field(uint8_t *dst, int dst_wrap,
-const uint8_t *src1, int src_wrap,
-int width, int height)
-{
-const uint8_t *src_m2, *src_m1, *src_0, *src_p1, *src_p2;
-int y;
-
-src_m2 = src1;
-src_m1 = src1;
-src_0=&src_m1[src_wrap];
-src_p1=&src_0[src_wrap];
-src_p2=&src_p1[src_wrap];
-for(y=0;y<(height-2);y+=2) {
-memcpy(dst,src_m1,width);
-dst += dst_wrap;
-deinterlace_line(dst,src_m2,src_m1,src_0,src_p1,src_p2,width);
-src_m2 = src_0;
-src_m1 = src_p1;
-src_0 = src_p2;
-src_p1 += 2*src_wrap;
-src_p2 += 2*src_wrap;
-dst += dst_wrap;
-}
-memcpy(dst,src_m1,width);
-dst += dst_wrap;
-/* do last line */
-deinterlace_line(dst,src_m2,src_m1,src_0,src_0,src_0,width);
-}
-
-static int deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap,
-int width, int height)
-{
-uint8_t *src_m1, *src_0, *src_p1, *src_p2;
-int y;
-uint8_t *buf;
-buf = av_malloc(width);
-if (!buf)
-return AVERROR(ENOMEM);
-
-src_m1 = src1;
-memcpy(buf,src_m1,width);
-src_0=&src_m1[src_wrap];
-src_p1=&src_0[src_wrap];
-src_p2=&src_p1[src_wrap];
-for(y=0;y<(height-2);y+=2) {
-deinterlace_line_inplace(buf,src_m1,src_0,src_p1,src_p2,width);
-src_m1 = src_
[FFmpeg-cvslog] Merge commit '183db02a51a422568084b113a7571c845ca68622'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 17:10:28 2015 +0200| [c10caea2144fefc5e3e80807f301b3bf7a9b2753] | committer: Hendrik Leppkes Merge commit '183db02a51a422568084b113a7571c845ca68622' * commit '183db02a51a422568084b113a7571c845ca68622': lavu: Drop deprecated old_pix_fmt.h and related code Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c10caea2144fefc5e3e80807f301b3bf7a9b2753 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu: Drop deprecated old_pix_fmt.h and related code
ffmpeg | branch: master | Vittorio Giovara | Tue Jul 28 14:30:27 2015 +0100| [183db02a51a422568084b113a7571c845ca68622] | committer: Vittorio Giovara lavu: Drop deprecated old_pix_fmt.h and related code Deprecated in 10/2012. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=183db02a51a422568084b113a7571c845ca68622 --- libavutil/Makefile |3 -- libavutil/old_pix_fmts.h | 134 -- libavutil/pixdesc.h | 14 - libavutil/pixfmt.h | 40 -- libavutil/version.h |3 -- 5 files changed, 194 deletions(-) diff --git a/libavutil/Makefile b/libavutil/Makefile index 0f8ed08..9d81006 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -34,7 +34,6 @@ HEADERS = adler32.h \ md5.h \ mem.h \ dict.h\ - old_pix_fmts.h\ opt.h \ parseutils.h \ pixdesc.h \ @@ -108,8 +107,6 @@ OBJS-$(CONFIG_LZO) += lzo.o OBJS += $(COMPAT_OBJS:%=../compat/%) -SKIPHEADERS = old_pix_fmts.h - SKIPHEADERS-$(HAVE_ATOMICS_GCC)+= atomic_gcc.h SKIPHEADERS-$(HAVE_ATOMICS_SUNCC) += atomic_suncc.h SKIPHEADERS-$(HAVE_ATOMICS_WIN32) += atomic_win32.h diff --git a/libavutil/old_pix_fmts.h b/libavutil/old_pix_fmts.h deleted file mode 100644 index d3e1e5b..000 --- a/libavutil/old_pix_fmts.h +++ /dev/null @@ -1,134 +0,0 @@ -/* - * This file is part of Libav. - * - * Libav is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * Libav is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVUTIL_OLD_PIX_FMTS_H -#define AVUTIL_OLD_PIX_FMTS_H - -/* - * This header exists to prevent new pixel formats from being accidentally added - * to the deprecated list. - * Do not include it directly. It will be removed on next major bump - * - * Do not add new items to this list. Use the AVPixelFormat enum instead. - */ -PIX_FMT_NONE = AV_PIX_FMT_NONE, -PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples) -PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr -PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB... -PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR... -PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples) -PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples) -PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y samples) -PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) -PIX_FMT_GRAY8, ///
[FFmpeg-cvslog] lavu: Drop deprecated external access to AVPixFmtDescriptor table
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:28 2015 +0100| [2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51] |
committer: Vittorio Giovara
lavu: Drop deprecated external access to AVPixFmtDescriptor table
Deprecated in 10/2012.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51
---
libavutil/pixdesc.c |5 +
libavutil/pixdesc.h |7 ---
libavutil/version.h |3 ---
3 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index c2c0157..cec3543 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -126,10 +126,7 @@ void av_write_image_line(const uint16_t *src,
}
}
-#if !FF_API_PIX_FMT_DESC
-static
-#endif
-const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
+static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_YUV420P] = {
.name = "yuv420p",
.nb_components = 3,
diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h
index 8a97095..3513913 100644
--- a/libavutil/pixdesc.h
+++ b/libavutil/pixdesc.h
@@ -137,13 +137,6 @@ typedef struct AVPixFmtDescriptor {
*/
#define AV_PIX_FMT_FLAG_ALPHA(1 << 7)
-#if FF_API_PIX_FMT_DESC
-/**
- * The array of all the pixel format descriptors.
- */
-extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[];
-#endif
-
/**
* Read a line from an image, and write the values of the
* pixel format component c to dst.
diff --git a/libavutil/version.h b/libavutil/version.h
index ad758cb..26fba37 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -81,9 +81,6 @@
#ifndef FF_API_CONTEXT_SIZE
#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
-#ifndef FF_API_PIX_FMT_DESC
-#define FF_API_PIX_FMT_DESC (LIBAVUTIL_VERSION_MAJOR < 55)
-#endif
#ifndef FF_API_AV_REVERSE
#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 17:12:23 2015 +0200| [0eed703d648c20eea8271be21f46540230d517e6] | committer: Hendrik Leppkes Merge commit '2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51' * commit '2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51': lavu: Drop deprecated external access to AVPixFmtDescriptor table Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0eed703d648c20eea8271be21f46540230d517e6 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu: Drop deprecated av_reverse function
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:29 2015 +0100| [cdfe45ad371b7a8e6135b6c063b6b2a93152cb3a] |
committer: Vittorio Giovara
lavu: Drop deprecated av_reverse function
Deprecated in 10/2012.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cdfe45ad371b7a8e6135b6c063b6b2a93152cb3a
---
libavutil/common.h |4
libavutil/mathematics.c | 21 -
libavutil/version.h |3 ---
3 files changed, 28 deletions(-)
diff --git a/libavutil/common.h b/libavutil/common.h
index 3265f9c..56556e7 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -63,10 +63,6 @@
/* misc math functions */
-#if FF_API_AV_REVERSE
-extern attribute_deprecated const uint8_t av_reverse[256];
-#endif
-
#ifdef HAVE_AV_CONFIG_H
# include "config.h"
# include "intmath.h"
diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c
index f36623a..c9b24af 100644
--- a/libavutil/mathematics.c
+++ b/libavutil/mathematics.c
@@ -29,27 +29,6 @@
#include "mathematics.h"
#include "version.h"
-#if FF_API_AV_REVERSE
-const uint8_t av_reverse[256] = {
-0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0,
-0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8,
-0x04,0x84,0x44,0xC4,0x24,0xA4,0x64,0xE4,0x14,0x94,0x54,0xD4,0x34,0xB4,0x74,0xF4,
-0x0C,0x8C,0x4C,0xCC,0x2C,0xAC,0x6C,0xEC,0x1C,0x9C,0x5C,0xDC,0x3C,0xBC,0x7C,0xFC,
-0x02,0x82,0x42,0xC2,0x22,0xA2,0x62,0xE2,0x12,0x92,0x52,0xD2,0x32,0xB2,0x72,0xF2,
-0x0A,0x8A,0x4A,0xCA,0x2A,0xAA,0x6A,0xEA,0x1A,0x9A,0x5A,0xDA,0x3A,0xBA,0x7A,0xFA,
-0x06,0x86,0x46,0xC6,0x26,0xA6,0x66,0xE6,0x16,0x96,0x56,0xD6,0x36,0xB6,0x76,0xF6,
-0x0E,0x8E,0x4E,0xCE,0x2E,0xAE,0x6E,0xEE,0x1E,0x9E,0x5E,0xDE,0x3E,0xBE,0x7E,0xFE,
-0x01,0x81,0x41,0xC1,0x21,0xA1,0x61,0xE1,0x11,0x91,0x51,0xD1,0x31,0xB1,0x71,0xF1,
-0x09,0x89,0x49,0xC9,0x29,0xA9,0x69,0xE9,0x19,0x99,0x59,0xD9,0x39,0xB9,0x79,0xF9,
-0x05,0x85,0x45,0xC5,0x25,0xA5,0x65,0xE5,0x15,0x95,0x55,0xD5,0x35,0xB5,0x75,0xF5,
-0x0D,0x8D,0x4D,0xCD,0x2D,0xAD,0x6D,0xED,0x1D,0x9D,0x5D,0xDD,0x3D,0xBD,0x7D,0xFD,
-0x03,0x83,0x43,0xC3,0x23,0xA3,0x63,0xE3,0x13,0x93,0x53,0xD3,0x33,0xB3,0x73,0xF3,
-0x0B,0x8B,0x4B,0xCB,0x2B,0xAB,0x6B,0xEB,0x1B,0x9B,0x5B,0xDB,0x3B,0xBB,0x7B,0xFB,
-0x07,0x87,0x47,0xC7,0x27,0xA7,0x67,0xE7,0x17,0x97,0x57,0xD7,0x37,0xB7,0x77,0xF7,
-0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF,
-};
-#endif
-
int64_t av_gcd(int64_t a, int64_t b)
{
if (b)
diff --git a/libavutil/version.h b/libavutil/version.h
index 26fba37..bcbf755 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -81,9 +81,6 @@
#ifndef FF_API_CONTEXT_SIZE
#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
-#ifndef FF_API_AV_REVERSE
-#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 55)
-#endif
#ifndef FF_API_AUDIOCONVERT
#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'cdfe45ad371b7a8e6135b6c063b6b2a93152cb3a'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 17:17:15 2015 +0200| [d96d0252fd535db5183492b804341cba93468b15] | committer: Hendrik Leppkes Merge commit 'cdfe45ad371b7a8e6135b6c063b6b2a93152cb3a' * commit 'cdfe45ad371b7a8e6135b6c063b6b2a93152cb3a': lavu: Drop deprecated av_reverse function Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d96d0252fd535db5183492b804341cba93468b15 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu: Drop deprecated audioconvert.h header
ffmpeg | branch: master | Vittorio Giovara | Tue Jul 28 14:30:30 2015 +0100| [2d40968dd3ff17b12f7c80dbfad409b14418e267] | committer: Vittorio Giovara lavu: Drop deprecated audioconvert.h header Deprecated in 11/2012. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d40968dd3ff17b12f7c80dbfad409b14418e267 --- libavutil/Makefile |1 - libavutil/audioconvert.h |6 -- libavutil/version.h |3 --- 3 files changed, 10 deletions(-) diff --git a/libavutil/Makefile b/libavutil/Makefile index 9d81006..17bd57e 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -4,7 +4,6 @@ HEADERS = adler32.h \ aes.h \ attributes.h \ audio_fifo.h \ - audioconvert.h\ avassert.h\ avstring.h\ avutil.h \ diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h deleted file mode 100644 index 300a67c..000 --- a/libavutil/audioconvert.h +++ /dev/null @@ -1,6 +0,0 @@ - -#include "version.h" - -#if FF_API_AUDIOCONVERT -#include "channel_layout.h" -#endif diff --git a/libavutil/version.h b/libavutil/version.h index bcbf755..75a7825 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -81,9 +81,6 @@ #ifndef FF_API_CONTEXT_SIZE #define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55) #endif -#ifndef FF_API_AUDIOCONVERT -#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 55) -#endif #ifndef FF_API_CPU_FLAG_MMX2 #define FF_API_CPU_FLAG_MMX2(LIBAVUTIL_VERSION_MAJOR < 55) #endif ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '2d40968dd3ff17b12f7c80dbfad409b14418e267'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 17:18:05 2015 +0200| [d9218011ef411c56073f63629842a1fa26454c75] | committer: Hendrik Leppkes Merge commit '2d40968dd3ff17b12f7c80dbfad409b14418e267' * commit '2d40968dd3ff17b12f7c80dbfad409b14418e267': lavu: Drop deprecated audioconvert.h header Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d9218011ef411c56073f63629842a1fa26454c75 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu: Drop deprecated AV_CPU_FLAG_MMX2 symbol
ffmpeg | branch: master | Vittorio Giovara | Tue Jul 28 14:30:31 2015 +0100| [bf7114b6caad8cf94696b0299c13b0d26bf291be] | committer: Vittorio Giovara lavu: Drop deprecated AV_CPU_FLAG_MMX2 symbol Deprecated in 11/2012. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf7114b6caad8cf94696b0299c13b0d26bf291be --- libavutil/cpu.h |3 --- libavutil/version.h |3 --- 2 files changed, 6 deletions(-) diff --git a/libavutil/cpu.h b/libavutil/cpu.h index 67a1abc..9c77ce6 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -28,9 +28,6 @@ /* lower 16 bits - CPU features */ #define AV_CPU_FLAG_MMX 0x0001 ///< standard MMX #define AV_CPU_FLAG_MMXEXT 0x0002 ///< SSE integer functions or AMD MMX ext -#if FF_API_CPU_FLAG_MMX2 -#define AV_CPU_FLAG_MMX2 0x0002 ///< SSE integer functions or AMD MMX ext -#endif #define AV_CPU_FLAG_3DNOW0x0004 ///< AMD 3DNOW #define AV_CPU_FLAG_SSE 0x0008 ///< SSE functions #define AV_CPU_FLAG_SSE2 0x0010 ///< PIV SSE2 functions diff --git a/libavutil/version.h b/libavutil/version.h index 75a7825..5d23e7a 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -81,9 +81,6 @@ #ifndef FF_API_CONTEXT_SIZE #define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55) #endif -#ifndef FF_API_CPU_FLAG_MMX2 -#define FF_API_CPU_FLAG_MMX2(LIBAVUTIL_VERSION_MAJOR < 55) -#endif #ifndef FF_API_LLS_PRIVATE #define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55) #endif ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit 'bf7114b6caad8cf94696b0299c13b0d26bf291be'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 17:19:50 2015 +0200| [58ebb39127da500ff1d54a059ecec0b344f113dd] | committer: Hendrik Leppkes Merge commit 'bf7114b6caad8cf94696b0299c13b0d26bf291be' * commit 'bf7114b6caad8cf94696b0299c13b0d26bf291be': lavu: Drop deprecated AV_CPU_FLAG_MMX2 symbol Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58ebb39127da500ff1d54a059ecec0b344f113dd --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu/cpu: remove old cmov cruft
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 17:23:28 2015 +0200| [f1b02e6ca88909f428d4a690c47620575853b647] | committer: Hendrik Leppkes lavu/cpu: remove old cmov cruft > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1b02e6ca88909f428d4a690c47620575853b647 --- libavutil/cpu.h |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavutil/cpu.h b/libavutil/cpu.h index 471f786..9403eca 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -46,11 +46,7 @@ #define AV_CPU_FLAG_AVXSLOW 0x800 ///< AVX supported, but slow when using YMM registers (e.g. Bulldozer) #define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions #define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions -// #if LIBAVUTIL_VERSION_MAJOR <52 -#define AV_CPU_FLAG_CMOV 0x1001000 ///< supports cmov instruction -// #else -// #define AV_CPU_FLAG_CMOV 0x1000 ///< supports cmov instruction -// #endif +#define AV_CPU_FLAG_CMOV 0x1000 ///< supports cmov instruction #define AV_CPU_FLAG_AVX2 0x8000 ///< AVX2 functions: requires OS support even if YMM registers aren't used #define AV_CPU_FLAG_FMA30x1 ///< Haswell FMA3 functions #define AV_CPU_FLAG_BMI10x2 ///< Bit Manipulation Instruction Set 1 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu: Drop deprecated duplicated AVFrame/AVCodecContext parameters
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:32 2015 +0100| [8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79] |
committer: Vittorio Giovara
lavu: Drop deprecated duplicated AVFrame/AVCodecContext parameters
Deprecated in 10/2012.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79
---
libavcodec/avcodec.h | 33 -
libavcodec/utils.c | 35 --
libavutil/frame.h| 99 --
libavutil/version.h |3 --
4 files changed, 170 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e4e656c..379311f 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3346,39 +3346,6 @@ const AVClass *avcodec_get_class(void);
*/
int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src);
-#if FF_API_AVFRAME_LAVC
-/**
- * @deprecated use av_frame_alloc()
- */
-attribute_deprecated
-AVFrame *avcodec_alloc_frame(void);
-
-/**
- * Set the fields of the given AVFrame to default values.
- *
- * @param frame The AVFrame of which the fields should be set to default
values.
- *
- * @deprecated use av_frame_unref()
- */
-attribute_deprecated
-void avcodec_get_frame_defaults(AVFrame *frame);
-
-/**
- * Free the frame and any dynamically allocated objects in it,
- * e.g. extended_data.
- *
- * @param frame frame to be freed. The pointer will be set to NULL.
- *
- * @warning this function does NOT free the data buffers themselves
- * (it does not know how, since they might have been allocated with
- * a custom get_buffer()).
- *
- * @deprecated use av_frame_free()
- */
-attribute_deprecated
-void avcodec_free_frame(AVFrame **frame);
-#endif
-
/**
* Initialize the AVCodecContext to use the given AVCodec. Prior to using this
* function the context has to be allocated with avcodec_alloc_context3().
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c5f60dc..1d718b2 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -818,41 +818,6 @@ int ff_get_format(AVCodecContext *avctx, const enum
AVPixelFormat *fmt)
return ret;
}
-#if FF_API_AVFRAME_LAVC
-void avcodec_get_frame_defaults(AVFrame *frame)
-{
-if (frame->extended_data != frame->data)
-av_freep(&frame->extended_data);
-
-memset(frame, 0, sizeof(AVFrame));
-
-frame->pts = AV_NOPTS_VALUE;
-frame->key_frame = 1;
-frame->sample_aspect_ratio = (AVRational) {0, 1 };
-frame->format = -1; /* unknown */
-frame->extended_data = frame->data;
-}
-
-AVFrame *avcodec_alloc_frame(void)
-{
-AVFrame *frame = av_mallocz(sizeof(AVFrame));
-
-if (!frame)
-return NULL;
-
-FF_DISABLE_DEPRECATION_WARNINGS
-avcodec_get_frame_defaults(frame);
-FF_ENABLE_DEPRECATION_WARNINGS
-
-return frame;
-}
-
-void avcodec_free_frame(AVFrame **frame)
-{
-av_frame_free(frame);
-}
-#endif
-
int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec
*codec, AVDictionary **options)
{
int ret = 0;
diff --git a/libavutil/frame.h b/libavutil/frame.h
index addcb25..d231ff3 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -201,11 +201,6 @@ typedef struct AVFrame {
*/
enum AVPictureType pict_type;
-#if FF_API_AVFRAME_LAVC
-attribute_deprecated
-uint8_t *base[AV_NUM_DATA_POINTERS];
-#endif
-
/**
* Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
*/
@@ -240,65 +235,6 @@ typedef struct AVFrame {
*/
int quality;
-#if FF_API_AVFRAME_LAVC
-attribute_deprecated
-int reference;
-
-/**
- * QP table
- */
-attribute_deprecated
-int8_t *qscale_table;
-/**
- * QP store stride
- */
-attribute_deprecated
-int qstride;
-
-attribute_deprecated
-int qscale_type;
-
-/**
- * mbskip_table[mb]>=1 if MB didn't change
- * stride= mb_width = (width+15)>>4
- */
-attribute_deprecated
-uint8_t *mbskip_table;
-
-/**
- * motion vector table
- * @code
- * example:
- * int mv_sample_log2= 4 - motion_subsample_log2;
- * int mb_width= (width+15)>>4;
- * int mv_stride= (mb_width << mv_sample_log2) + 1;
- * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
- * @endcode
- */
-attribute_deprecated
-int16_t (*motion_val[2])[2];
-
-/**
- * macroblock type table
- * mb_type_base + mb_width + 2
- */
-attribute_deprecated
-uint32_t *mb_type;
-
-/**
- * DCT coefficients
- */
-attribute_deprecated
-short *dct_coeff;
-
-/**
- * motion reference frame index
- * the order in which these are stored can depend on the codec.
- */
-attribute_deprecated
-int8_t *ref_index[2];
-#endif
-
/**
* for some private data of the user
*/
@@ -309,11 +245,6 @@ typedef struct AVFrame {
*/
uint64_t error[AV_NUM_DATA_POINTERS];
-#if FF
[FFmpeg-cvslog] Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 17:31:45 2015 +0200| [b9fd813351733b867fb73219e33b1f4845b40dde] | committer: Hendrik Leppkes Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79' * commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79': lavu: Drop deprecated duplicated AVFrame/AVCodecContext parameters Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9fd813351733b867fb73219e33b1f4845b40dde --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu/frame: put frame QP elements under a new version guard
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5
17:35:31 2015 +0200| [a9915268327b097bba84a07f68968d8c07f4b549] | committer:
Hendrik Leppkes
lavu/frame: put frame QP elements under a new version guard
These fields are still used, removal postponed until a replacement
functionality is available.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9915268327b097bba84a07f68968d8c07f4b549
---
libavutil/frame.c | 12
libavutil/frame.h |4
libavutil/version.h |3 +++
3 files changed, 19 insertions(+)
diff --git a/libavutil/frame.c b/libavutil/frame.c
index f403fd7..7b4177b 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -46,29 +46,35 @@ MAKE_ACCESSORS(AVFrame, frame, enum AVColorRange,
color_range)
AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame) {return
&frame->metadata;};
+#if FF_API_FRAME_QP
int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int
qp_type)
{
av_buffer_unref(&f->qp_table_buf);
f->qp_table_buf = buf;
+FF_DISABLE_DEPRECATION_WARNINGS
f->qscale_table = buf->data;
f->qstride = stride;
f->qscale_type = qp_type;
+FF_ENABLE_DEPRECATION_WARNINGS
return 0;
}
int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type)
{
+FF_DISABLE_DEPRECATION_WARNINGS
*stride = f->qstride;
*type = f->qscale_type;
+FF_ENABLE_DEPRECATION_WARNINGS
if (!f->qp_table_buf)
return NULL;
return f->qp_table_buf->data;
}
+#endif
const char *av_get_colorspace_name(enum AVColorSpace val)
{
@@ -342,6 +348,8 @@ static int frame_copy_props(AVFrame *dst, const AVFrame
*src, int force_copy)
av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0);
}
+#if FF_API_FRAME_QP
+FF_DISABLE_DEPRECATION_WARNINGS
dst->qscale_table = NULL;
dst->qstride = 0;
dst->qscale_type = 0;
@@ -353,6 +361,8 @@ static int frame_copy_props(AVFrame *dst, const AVFrame
*src, int force_copy)
dst->qscale_type = src->qscale_type;
}
}
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
return 0;
}
@@ -471,7 +481,9 @@ void av_frame_unref(AVFrame *frame)
av_buffer_unref(&frame->extended_buf[i]);
av_freep(&frame->extended_buf);
av_dict_free(&frame->metadata);
+#if FF_API_FRAME_QP
av_buffer_unref(&frame->qp_table_buf);
+#endif
get_frame_defaults(frame);
}
diff --git a/libavutil/frame.h b/libavutil/frame.h
index f5e8937..5270798 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -477,6 +477,7 @@ typedef struct AVFrame {
*/
int pkt_size;
+#if FF_API_FRAME_QP
/**
* QP table
* Not to be accessed directly from outside libavutil
@@ -497,6 +498,7 @@ typedef struct AVFrame {
* Not to be accessed directly from outside libavutil
*/
AVBufferRef *qp_table_buf;
+#endif
} AVFrame;
/**
@@ -523,8 +525,10 @@ voidav_frame_set_decode_error_flags (AVFrame *frame,
int val);
int av_frame_get_pkt_size(const AVFrame *frame);
voidav_frame_set_pkt_size(AVFrame *frame, int val);
AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame);
+#if FF_API_FRAME_QP
int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type);
int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int type);
+#endif
enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame);
voidav_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val);
enum AVColorRange av_frame_get_color_range(const AVFrame *frame);
diff --git a/libavutil/version.h b/libavutil/version.h
index 9fbdc72..31d9521 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -117,6 +117,9 @@
#ifndef FF_API_VAAPI
#define FF_API_VAAPI(LIBAVUTIL_VERSION_MAJOR < 56)
#endif
+#ifndef FF_API_FRAME_QP
+#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56)
+#endif
#ifndef FF_CONST_AVUTIL55
#if LIBAVUTIL_VERSION_MAJOR >= 55
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu: Drop deprecated context size variables
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:33 2015 +0100| [2f9b652e8c646eabef74a6742f0d7d4c9118fd0e] |
committer: Vittorio Giovara
lavu: Drop deprecated context size variables
Deprecated in 10/2012.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f9b652e8c646eabef74a6742f0d7d4c9118fd0e
---
libavutil/aes.c |4
libavutil/aes.h |4
libavutil/md5.c |4
libavutil/md5.h |4
libavutil/sha.c |4
libavutil/sha.h |4
libavutil/tree.c|4
libavutil/tree.h|3 ---
libavutil/version.h |3 ---
9 files changed, 34 deletions(-)
diff --git a/libavutil/aes.c b/libavutil/aes.c
index 3ba5e9a..02a9281 100644
--- a/libavutil/aes.c
+++ b/libavutil/aes.c
@@ -40,10 +40,6 @@ typedef struct AVAES {
int rounds;
} AVAES;
-#if FF_API_CONTEXT_SIZE
-const int av_aes_size= sizeof(AVAES);
-#endif
-
struct AVAES *av_aes_alloc(void)
{
return av_mallocz(sizeof(struct AVAES));
diff --git a/libavutil/aes.h b/libavutil/aes.h
index edff275..5b45124 100644
--- a/libavutil/aes.h
+++ b/libavutil/aes.h
@@ -32,10 +32,6 @@
* @{
*/
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_aes_size;
-#endif
-
struct AVAES;
/**
diff --git a/libavutil/md5.c b/libavutil/md5.c
index efb993e..f2e9061 100644
--- a/libavutil/md5.c
+++ b/libavutil/md5.c
@@ -42,10 +42,6 @@ typedef struct AVMD5{
uint32_t ABCD[4];
} AVMD5;
-#if FF_API_CONTEXT_SIZE
-const int av_md5_size = sizeof(AVMD5);
-#endif
-
struct AVMD5 *av_md5_alloc(void)
{
return av_mallocz(sizeof(struct AVMD5));
diff --git a/libavutil/md5.h b/libavutil/md5.h
index 29e4e7c..c26318c 100644
--- a/libavutil/md5.h
+++ b/libavutil/md5.h
@@ -32,10 +32,6 @@
* @{
*/
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_md5_size;
-#endif
-
struct AVMD5;
struct AVMD5 *av_md5_alloc(void);
diff --git a/libavutil/sha.c b/libavutil/sha.c
index 2d9b58c..9e78d19 100644
--- a/libavutil/sha.c
+++ b/libavutil/sha.c
@@ -40,10 +40,6 @@ typedef struct AVSHA {
void (*transform)(uint32_t *state, const uint8_t buffer[64]);
} AVSHA;
-#if FF_API_CONTEXT_SIZE
-const int av_sha_size = sizeof(AVSHA);
-#endif
-
struct AVSHA *av_sha_alloc(void)
{
return av_mallocz(sizeof(struct AVSHA));
diff --git a/libavutil/sha.h b/libavutil/sha.h
index 4c9a0c9..86ea0b0 100644
--- a/libavutil/sha.h
+++ b/libavutil/sha.h
@@ -32,10 +32,6 @@
* @{
*/
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_sha_size;
-#endif
-
struct AVSHA;
/**
diff --git a/libavutil/tree.c b/libavutil/tree.c
index d48d01a..998851f 100644
--- a/libavutil/tree.c
+++ b/libavutil/tree.c
@@ -29,10 +29,6 @@ typedef struct AVTreeNode {
int state;
} AVTreeNode;
-#if FF_API_CONTEXT_SIZE
-const int av_tree_node_size = sizeof(AVTreeNode);
-#endif
-
struct AVTreeNode *av_tree_node_alloc(void)
{
return av_mallocz(sizeof(struct AVTreeNode));
diff --git a/libavutil/tree.h b/libavutil/tree.h
index 424656e..e2f191c 100644
--- a/libavutil/tree.h
+++ b/libavutil/tree.h
@@ -43,9 +43,6 @@
struct AVTreeNode;
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_tree_node_size;
-#endif
/**
* Allocate an AVTreeNode.
diff --git a/libavutil/version.h b/libavutil/version.h
index afb64ae..3b28b83 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -78,9 +78,6 @@
* @{
*/
-#ifndef FF_API_CONTEXT_SIZE
-#define FF_API_CONTEXT_SIZE (LIBAVUTIL_VERSION_MAJOR < 55)
-#endif
#ifndef FF_API_LLS_PRIVATE
#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '2f9b652e8c646eabef74a6742f0d7d4c9118fd0e'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 17:44:55 2015 +0200| [f940931995d038c9b0527f14b64953101865708a] | committer: Hendrik Leppkes Merge commit '2f9b652e8c646eabef74a6742f0d7d4c9118fd0e' * commit '2f9b652e8c646eabef74a6742f0d7d4c9118fd0e': lavu: Drop deprecated context size variables These variables had been previously un-deprecated in ffmpeg, not removed. Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f940931995d038c9b0527f14b64953101865708a --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu: Drop deprecated private lls functions
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:34 2015 +0100| [3d89373fae281053154772d5e3e4370da09d3880] |
committer: Vittorio Giovara
lavu: Drop deprecated private lls functions
Deprecated in 02/2013.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d89373fae281053154772d5e3e4370da09d3880
---
libavutil/lls.c | 19 ---
libavutil/lls.h |7 ---
libavutil/version.h |3 ---
3 files changed, 29 deletions(-)
diff --git a/libavutil/lls.c b/libavutil/lls.c
index f87c2cd..1298946 100644
--- a/libavutil/lls.c
+++ b/libavutil/lls.c
@@ -121,25 +121,6 @@ av_cold void avpriv_init_lls(LLSModel *m, int indep_count)
ff_init_lls_x86(m);
}
-#if FF_API_LLS_PRIVATE
-av_cold void av_init_lls(LLSModel *m, int indep_count)
-{
-avpriv_init_lls(m, indep_count);
-}
-void av_update_lls(LLSModel *m, double *param, double decay)
-{
-m->update_lls(m, param);
-}
-void av_solve_lls(LLSModel *m, double threshold, int min_order)
-{
-avpriv_solve_lls(m, threshold, min_order);
-}
-double av_evaluate_lls(LLSModel *m, double *param, int order)
-{
-return m->evaluate_lls(m, param, order);
-}
-#endif /* FF_API_LLS_PRIVATE */
-
#ifdef TEST
#include
diff --git a/libavutil/lls.h b/libavutil/lls.h
index 27c0d5e..9b2b3a4 100644
--- a/libavutil/lls.h
+++ b/libavutil/lls.h
@@ -61,11 +61,4 @@ void avpriv_init_lls(LLSModel *m, int indep_count);
void ff_init_lls_x86(LLSModel *m);
void avpriv_solve_lls(LLSModel *m, double threshold, unsigned short min_order);
-#if FF_API_LLS_PRIVATE
-void av_init_lls(LLSModel *m, int indep_count);
-void av_update_lls(LLSModel *m, double *param, double decay);
-void av_solve_lls(LLSModel *m, double threshold, int min_order);
-double av_evaluate_lls(LLSModel *m, double *param, int order);
-#endif /* FF_API_LLS_PRIVATE */
-
#endif /* AVUTIL_LLS_H */
diff --git a/libavutil/version.h b/libavutil/version.h
index 3b28b83..02a9563 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -78,9 +78,6 @@
* @{
*/
-#ifndef FF_API_LLS_PRIVATE
-#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55)
-#endif
#ifndef FF_API_VDPAU
#define FF_API_VDPAU(LIBAVUTIL_VERSION_MAJOR < 55)
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '3d89373fae281053154772d5e3e4370da09d3880'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 17:46:47 2015 +0200| [6f6c025d6d11ef43918a32c521f487e1156f54bd] | committer: Hendrik Leppkes Merge commit '3d89373fae281053154772d5e3e4370da09d3880' * commit '3d89373fae281053154772d5e3e4370da09d3880': lavu: Drop deprecated private lls functions Previously removed in ffmpeg Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f6c025d6d11ef43918a32c521f487e1156f54bd --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 17:52:10 2015 +0200| [2df52088ef5c4ce284af99775dfe7ad1fed03614] | committer: Hendrik Leppkes Merge commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a' * commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a': Postpone API-incompatible changes until the next bump Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2df52088ef5c4ce284af99775dfe7ad1fed03614 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Postpone API-incompatible changes until the next bump
ffmpeg | branch: master | Vittorio Giovara | Tue Jul 28 14:30:35 2015 +0100| [4e649debcf7f71d35c6b38cdb7ee715eba95d64a] | committer: Vittorio Giovara Postpone API-incompatible changes until the next bump > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e649debcf7f71d35c6b38cdb7ee715eba95d64a --- libavcodec/version.h | 58 - libavfilter/version.h | 10 - libavformat/version.h |6 ++--- libavutil/version.h |8 +++ 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/libavcodec/version.h b/libavcodec/version.h index 681c2e6..517f0ea 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -49,91 +49,91 @@ */ #ifndef FF_API_MISSING_SAMPLE -#define FF_API_MISSING_SAMPLE(LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_MISSING_SAMPLE(LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_LOWRES -#define FF_API_LOWRES(LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_LOWRES(LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_CAP_VDPAU -#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_BUFS_VDPAU -#define FF_API_BUFS_VDPAU(LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_BUFS_VDPAU(LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_VOXWARE -#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_SET_DIMENSIONS -#define FF_API_SET_DIMENSIONS(LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_SET_DIMENSIONS(LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_DEBUG_MV -#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_AC_VLC -#define FF_API_AC_VLC(LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_AC_VLC(LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_OLD_MSMPEG4 -#define FF_API_OLD_MSMPEG4 (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_OLD_MSMPEG4 (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_ASPECT_EXTENDED -#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_ASPECT_EXTENDED (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_ARCH_ALPHA -#define FF_API_ARCH_ALPHA(LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_ARCH_ALPHA(LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_XVMC -#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_ERROR_RATE -#define FF_API_ERROR_RATE(LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_ERROR_RATE(LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_QSCALE_TYPE -#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_MB_TYPE -#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_MAX_BFRAMES -#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_FAST_MALLOC -#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_NEG_LINESIZES -#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_EMU_EDGE -#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_ARCH_SH4 -#define FF_API_ARCH_SH4 (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_ARCH_SH4 (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_ARCH_SPARC -#define FF_API_ARCH_SPARC(LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_ARCH_SPARC(LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_UNUSED_MEMBERS -#define FF_API_UNUSED_MEMBERS(LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_UNUSED_MEMBERS(LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_IDCT_XVIDMMX -#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_INPUT_PRESERVED -#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_NORMALIZE_AQP -#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_NORMALIZE_AQP (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_GMC -#define FF_API_GMC (LIBAVCODEC_VERSION_MAJOR < 57) +
[FFmpeg-cvslog] Remove FF_CONST_AVUTIL55 cruft
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5
17:56:28 2015 +0200| [545559e43db5c55924bb9ecedf7465fa58f2f9a6] | committer:
Hendrik Leppkes
Remove FF_CONST_AVUTIL55 cruft
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=545559e43db5c55924bb9ecedf7465fa58f2f9a6
---
libavutil/opt.c |6 +++---
libavutil/opt.h |6 +++---
libavutil/version.h |8
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 580586e..22e6775 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -42,13 +42,13 @@
#include
#if FF_API_OLD_AVOPTIONS
-const AVOption *av_next_option(FF_CONST_AVUTIL55 void *obj, const AVOption
*last)
+const AVOption *av_next_option(const void *obj, const AVOption *last)
{
return av_opt_next(obj, last);
}
#endif
-const AVOption *av_opt_next(FF_CONST_AVUTIL55 void *obj, const AVOption *last)
+const AVOption *av_opt_next(const void *obj, const AVOption *last)
{
const AVClass *class;
if (!obj)
@@ -1573,7 +1573,7 @@ static int opt_size(enum AVOptionType type)
return 0;
}
-int av_opt_copy(void *dst, FF_CONST_AVUTIL55 void *src)
+int av_opt_copy(void *dst, const void *src)
{
const AVOption *o = NULL;
const AVClass *c;
diff --git a/libavutil/opt.h b/libavutil/opt.h
index 4f2b46e..72e3a1c 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -420,7 +420,7 @@ AVRational av_get_q(void *obj, const char *name, const
AVOption **o_out);
attribute_deprecated
int64_t av_get_int(void *obj, const char *name, const AVOption **o_out);
attribute_deprecated const char *av_get_string(void *obj, const char *name,
const AVOption **o_out, char *buf, int buf_len);
-attribute_deprecated const AVOption *av_next_option(FF_CONST_AVUTIL55 void
*obj, const AVOption *last);
+attribute_deprecated const AVOption *av_next_option(const void *obj, const
AVOption *last);
#endif
/**
@@ -683,7 +683,7 @@ const AVOption *av_opt_find2(void *obj, const char *name,
const char *unit,
* or NULL
* @return next AVOption or NULL
*/
-const AVOption *av_opt_next(FF_CONST_AVUTIL55 void *obj, const AVOption *prev);
+const AVOption *av_opt_next(const void *obj, const AVOption *prev);
/**
* Iterate over AVOptions-enabled children of obj.
@@ -835,7 +835,7 @@ int av_opt_query_ranges(AVOptionRanges **, void *obj, const
char *key, int flags
* @param src Object to copy into
* @return 0 on success, negative on error
*/
-int av_opt_copy(void *dest, FF_CONST_AVUTIL55 void *src);
+int av_opt_copy(void *dest, const void *src);
/**
* Get a default list of allowed ranges for the given option.
diff --git a/libavutil/version.h b/libavutil/version.h
index 0fd0d6f..233720f 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -115,14 +115,6 @@
#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
-#ifndef FF_CONST_AVUTIL55
-#if LIBAVUTIL_VERSION_MAJOR >= 55
-#define FF_CONST_AVUTIL55 const
-#else
-#define FF_CONST_AVUTIL55
-#endif
-#endif
-
/**
* @}
*/
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avutil: undo FF_API_CRYPTO_CONTEXT deprecation for 2.8 release
ffmpeg | branch: release/2.8 | James Almer | Sat Sep 5
12:58:39 2015 -0300| [1a56be9cdc9b541418f850a431271d69af802795] | committer:
James Almer
avutil: undo FF_API_CRYPTO_CONTEXT deprecation for 2.8 release
There's no consensus yet if this deprecation is desired, so it's removed
from this release for the time being
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a56be9cdc9b541418f850a431271d69af802795
---
libavutil/blowfish.c |9 -
libavutil/blowfish.h |4
libavutil/des.c |7 ---
libavutil/des.h |4
libavutil/rc4.c |7 ---
libavutil/rc4.h |4
libavutil/version.h |3 ---
libavutil/xtea.c |6 --
libavutil/xtea.h |4
9 files changed, 48 deletions(-)
diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c
index 4f7e4df..0ab104e 100644
--- a/libavutil/blowfish.c
+++ b/libavutil/blowfish.c
@@ -27,15 +27,6 @@
#include "mem.h"
#include "blowfish.h"
-#if !FF_API_CRYPTO_CONTEXT
-#define AV_BF_ROUNDS 16
-
-struct AVBlowfish {
-uint32_t p[AV_BF_ROUNDS + 2];
-uint32_t s[4][256];
-};
-#endif
-
static const uint32_t orig_p[AV_BF_ROUNDS + 2] = {
0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
diff --git a/libavutil/blowfish.h b/libavutil/blowfish.h
index d163fd3..29e2747 100644
--- a/libavutil/blowfish.h
+++ b/libavutil/blowfish.h
@@ -31,16 +31,12 @@
* @{
*/
-#if FF_API_CRYPTO_CONTEXT
#define AV_BF_ROUNDS 16
typedef struct AVBlowfish {
uint32_t p[AV_BF_ROUNDS + 2];
uint32_t s[4][256];
} AVBlowfish;
-#else
-typedef struct AVBlowfish AVBlowfish;
-#endif
/**
* Allocate an AVBlowfish context.
diff --git a/libavutil/des.c b/libavutil/des.c
index e7e9178..c97158a 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -25,13 +25,6 @@
#include "mem.h"
#include "des.h"
-#if !FF_API_CRYPTO_CONTEXT
-struct AVDES {
-uint64_t round_keys[3][16];
-int triple_des;
-};
-#endif
-
#define T(a, b, c, d, e, f, g, h) 64-a,64-b,64-c,64-d,64-e,64-f,64-g,64-h
static const uint8_t IP_shuffle[] = {
T(58, 50, 42, 34, 26, 18, 10, 2),
diff --git a/libavutil/des.h b/libavutil/des.h
index 224745e..4cf11f5 100644
--- a/libavutil/des.h
+++ b/libavutil/des.h
@@ -30,14 +30,10 @@
* @{
*/
-#if FF_API_CRYPTO_CONTEXT
typedef struct AVDES {
uint64_t round_keys[3][16];
int triple_des;
} AVDES;
-#else
-typedef struct AVDES AVDES;
-#endif
/**
* Allocate an AVDES context.
diff --git a/libavutil/rc4.c b/libavutil/rc4.c
index e507b4a..6bd702c 100644
--- a/libavutil/rc4.c
+++ b/libavutil/rc4.c
@@ -25,13 +25,6 @@
#include "mem.h"
#include "rc4.h"
-#if !FF_API_CRYPTO_CONTEXT
-struct AVRC4 {
-uint8_t state[256];
-int x, y;
-};
-#endif
-
AVRC4 *av_rc4_alloc(void)
{
return av_mallocz(sizeof(struct AVRC4));
diff --git a/libavutil/rc4.h b/libavutil/rc4.h
index 47c9793..ef673b9 100644
--- a/libavutil/rc4.h
+++ b/libavutil/rc4.h
@@ -30,14 +30,10 @@
* @{
*/
-#if FF_API_CRYPTO_CONTEXT
typedef struct AVRC4 {
uint8_t state[256];
int x, y;
} AVRC4;
-#else
-typedef struct AVRC4 AVRC4;
-#endif
/**
* Allocate an AVRC4 context.
diff --git a/libavutil/version.h b/libavutil/version.h
index 64713d3..2ad85e3 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -129,9 +129,6 @@
#ifndef FF_API_HMAC
#define FF_API_HMAC (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
-#ifndef FF_API_CRYPTO_CONTEXT
-#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 56)
-#endif
#ifndef FF_API_VAAPI
#define FF_API_VAAPI(LIBAVUTIL_VERSION_MAJOR < 56)
#endif
diff --git a/libavutil/xtea.c b/libavutil/xtea.c
index b95f322..0d58cba 100644
--- a/libavutil/xtea.c
+++ b/libavutil/xtea.c
@@ -34,12 +34,6 @@
#include "mem.h"
#include "xtea.h"
-#if !FF_API_CRYPTO_CONTEXT
-struct AVXTEA {
-uint32_t key[16];
-};
-#endif
-
AVXTEA *av_xtea_alloc(void)
{
return av_mallocz(sizeof(struct AVXTEA));
diff --git a/libavutil/xtea.h b/libavutil/xtea.h
index 4281fd8..9c45c6c 100644
--- a/libavutil/xtea.h
+++ b/libavutil/xtea.h
@@ -33,13 +33,9 @@
* @{
*/
-#if FF_API_CRYPTO_CONTEXT
typedef struct AVXTEA {
uint32_t key[16];
} AVXTEA;
-#else
-typedef struct AVXTEA AVXTEA;
-#endif
/**
* Allocate an AVXTEA context.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu/hmac: remove deprecated type ids
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5
18:01:38 2015 +0200| [137f0759933390ecbde2bff0e009deabb4273c72] | committer:
Hendrik Leppkes
lavu/hmac: remove deprecated type ids
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=137f0759933390ecbde2bff0e009deabb4273c72
---
libavutil/hmac.c|6 --
libavutil/hmac.h|4
libavutil/version.h |3 ---
3 files changed, 13 deletions(-)
diff --git a/libavutil/hmac.c b/libavutil/hmac.c
index 0cf4cd6..3e11509 100644
--- a/libavutil/hmac.c
+++ b/libavutil/hmac.c
@@ -81,9 +81,6 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type)
c->hash = av_sha_alloc();
break;
case AV_HMAC_SHA224:
-#if FF_API_HMAC
-case AV_HMAC_SHA224_DEPRECATED:
-#endif
c->blocklen = 64;
c->hashlen = 28;
c->init = sha224_init;
@@ -92,9 +89,6 @@ AVHMAC *av_hmac_alloc(enum AVHMACType type)
c->hash = av_sha_alloc();
break;
case AV_HMAC_SHA256:
-#if FF_API_HMAC
-case AV_HMAC_SHA256_DEPRECATED:
-#endif
c->blocklen = 64;
c->hashlen = 32;
c->init = sha256_init;
diff --git a/libavutil/hmac.h b/libavutil/hmac.h
index 892c02e..576a0a4 100644
--- a/libavutil/hmac.h
+++ b/libavutil/hmac.h
@@ -35,10 +35,6 @@ enum AVHMACType {
AV_HMAC_SHA1,
AV_HMAC_SHA224,
AV_HMAC_SHA256,
-#if FF_API_HMAC
-AV_HMAC_SHA224_DEPRECATED = 10,
-AV_HMAC_SHA256_DEPRECATED,
-#endif
AV_HMAC_SHA384 = 12,
AV_HMAC_SHA512,
};
diff --git a/libavutil/version.h b/libavutil/version.h
index 233720f..55f4420 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -102,9 +102,6 @@
#ifndef FF_API_DLOG
#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
-#ifndef FF_API_HMAC
-#define FF_API_HMAC (LIBAVUTIL_VERSION_MAJOR < 55)
-#endif
#ifndef FF_API_CRYPTO_CONTEXT
#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/ac3: sync AC3HeaderInfo struct with the fork
ffmpeg | branch: master | James Almer | Sat Sep 5 13:18:46
2015 -0300| [4a447e3e692ee52ec2b226973843dbd3ce9bb02b] | committer: James Almer
avcodec/ac3: sync AC3HeaderInfo struct with the fork
Reviewed-by: Hendrik Leppkes
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a447e3e692ee52ec2b226973843dbd3ce9bb02b
---
libavcodec/ac3.h |5 -
1 file changed, 5 deletions(-)
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index 1fe30b9..3f67e09 100644
--- a/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@@ -190,9 +190,7 @@ typedef struct AC3HeaderInfo {
int surround_mix_level; ///< Surround mix level index
uint16_t channel_map;
int num_blocks; ///< number of audio blocks
-#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
int dolby_surround_mode;
-#endif
/** @} */
/** @name Derived values
@@ -205,9 +203,6 @@ typedef struct AC3HeaderInfo {
uint16_t frame_size;
uint64_t channel_layout;
/** @} */
-#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
-int dolby_surround_mode;
-#endif
} AC3HeaderInfo;
typedef enum {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/APIchanges: add 2.8 cut line
ffmpeg | branch: master | Michael Niedermayer | Sat Sep 5 16:38:53 2015 +0200| [982e235d76d3b436e5a247e2083c7dec16040eee] | committer: Michael Niedermayer doc/APIchanges: add 2.8 cut line Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=982e235d76d3b436e5a247e2083c7dec16040eee --- doc/APIchanges |2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index aa92b69..e1d7d39 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,8 @@ libavutil: 2014-08-09 API changes, most recent first: + 8< - FFmpeg 2.8 was cut here 8< - + 2015-xx-xx - lavc 56.58.100 - vaapi.h Deprecate old VA-API context (vaapi_context) fields that were only set and used by libavcodec. They are all managed internally now. ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/APIchanges: Fill in missing fields and correct one lavu version
ffmpeg | branch: master | Michael Niedermayer | Sat Sep 5 17:00:22 2015 +0200| [0acd4e75fdad1b6656a8722e386679ec9f8b0ba7] | committer: Michael Niedermayer doc/APIchanges: Fill in missing fields and correct one lavu version Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0acd4e75fdad1b6656a8722e386679ec9f8b0ba7 --- doc/APIchanges | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index e1d7d39..459fa5b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -17,27 +17,27 @@ API changes, most recent first: 8< - FFmpeg 2.8 was cut here 8< - -2015-xx-xx - lavc 56.58.100 - vaapi.h +2015-08-27 - 1dd854e1 - lavc 56.58.100 - vaapi.h Deprecate old VA-API context (vaapi_context) fields that were only set and used by libavcodec. They are all managed internally now. -2015-xx-xx - lavu 54.31.100 - pixfmt.h +2015-08-19 - 9f8e57ef - lavu 54.31.100 - pixfmt.h Add a unique pixel format for VA-API (AV_PIX_FMT_VAAPI) that indicates the nature of the underlying storage: a VA surface. This yields the same value as AV_PIX_FMT_VAAPI_VLD. Deprecate old VA-API related pixel formats: AV_PIX_FMT_VAAPI_MOCO, AV_PIX_FMT_VAAPI_IDCT, AV_PIX_FMT_VAAPI_VLD. -2015-xx-xx - lavu 54.30.0 - xxx - Add av_blowfish_alloc(). - xxx - Add av_rc4_alloc(). - xxx - Add av_xtea_alloc(). - xxx - Add av_des_alloc(). +2015-08-02 - lavu 54.30.100 / 54.17.0 + 9ed59f1 / 7a7df34c - Add av_blowfish_alloc(). + a130ec9 / ae365453 - Add av_rc4_alloc(). + 9ca1997 / 5d8bea3b - Add av_xtea_alloc(). + 3cf08e9 / d9e8b47e - Add av_des_alloc(). -2015-xx-xx - lavc 56.35.0 - avcodec.h - x - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*. - x - Rename CODEC_CAP_* defines to AV_CODEC_CAP_*. - x - Rename FF_INPUT_BUFFER_PADDING_SIZE and FF_MIN_BUFFER_SIZE +2015-07-27 - lavc 56.56.100 / 56.35.0 - avcodec.h + 94d68a4 / 7c6eb0a1 - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*. + 444e987 / def97856 - Rename CODEC_CAP_* defines to AV_CODEC_CAP_*. + 29d147c / 059a9348 - Rename FF_INPUT_BUFFER_PADDING_SIZE and FF_MIN_BUFFER_SIZE to AV_INPUT_BUFFER_PADDING_SIZE and AV_INPUT_BUFFER_MIN_SIZE. 2015-07-22 - c40ecff - lavc 56.51.100 - avcodec.h ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/libutvideodec: remove AVFrame->reference usage, otherwise the code does not build
ffmpeg | branch: master | Michael Niedermayer | Sat Sep 5 18:04:40 2015 +0200| [998fa4fa3010fa3aa6b723b86642a21a5ff8e4d9] | committer: Michael Niedermayer avcodec/libutvideodec: remove AVFrame->reference usage, otherwise the code does not build Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=998fa4fa3010fa3aa6b723b86642a21a5ff8e4d9 --- libavcodec/libutvideodec.cpp |1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/libutvideodec.cpp b/libavcodec/libutvideodec.cpp index e4b87a8..47261a6 100644 --- a/libavcodec/libutvideodec.cpp +++ b/libavcodec/libutvideodec.cpp @@ -145,7 +145,6 @@ static int utvideo_decode_frame(AVCodecContext *avctx, void *data, int w = avctx->width, h = avctx->height; /* Set flags */ -pic->reference = 0; pic->pict_type = AV_PICTURE_TYPE_I; pic->key_frame = 1; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/examples/demuxing_decoding: Drop old api mode, because the code fails to build otherwise
ffmpeg | branch: master | Michael Niedermayer | Sat
Sep 5 18:01:31 2015 +0200| [a753e6c9f508fd48a0f34438bcdce87c826779b9] |
committer: Michael Niedermayer
doc/examples/demuxing_decoding: Drop old api mode, because the code fails to
build otherwise
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a753e6c9f508fd48a0f34438bcdce87c826779b9
---
doc/examples/demuxing_decoding.c | 18 --
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/doc/examples/demuxing_decoding.c b/doc/examples/demuxing_decoding.c
index 98b3a83..e540622 100644
--- a/doc/examples/demuxing_decoding.c
+++ b/doc/examples/demuxing_decoding.c
@@ -60,12 +60,11 @@ static int audio_frame_count = 0;
* appropriate to your needs. Look for the use of api_mode in this example to
* see what are the differences of API usage between them */
enum {
-API_MODE_OLD = 0, /* old method, deprecated */
API_MODE_NEW_API_REF_COUNT= 1, /* new method, using the frame
reference counting */
API_MODE_NEW_API_NO_REF_COUNT = 2, /* new method, without reference
counting */
};
-static int api_mode = API_MODE_OLD;
+static int api_mode = API_MODE_NEW_API_NO_REF_COUNT;
static int decode_packet(int *got_frame, int cached)
{
@@ -243,8 +242,7 @@ int main (int argc, char **argv)
}
if (argc == 5) {
const char *mode = argv[1] + strlen("-refcount=");
-if (!strcmp(mode, "old"))api_mode = API_MODE_OLD;
-else if (!strcmp(mode, "new_norefcount")) api_mode =
API_MODE_NEW_API_NO_REF_COUNT;
+if (!strcmp(mode, "new_norefcount")) api_mode =
API_MODE_NEW_API_NO_REF_COUNT;
else if (!strcmp(mode, "new_refcount")) api_mode =
API_MODE_NEW_API_REF_COUNT;
else {
fprintf(stderr, "unknow mode '%s'\n", mode);
@@ -315,12 +313,7 @@ int main (int argc, char **argv)
goto end;
}
-/* When using the new API, you need to use the libavutil/frame.h API, while
- * the classic frame management is available in libavcodec */
-if (api_mode == API_MODE_OLD)
-frame = avcodec_alloc_frame();
-else
-frame = av_frame_alloc();
+frame = av_frame_alloc();
if (!frame) {
fprintf(stderr, "Could not allocate frame\n");
ret = AVERROR(ENOMEM);
@@ -397,10 +390,7 @@ end:
fclose(video_dst_file);
if (audio_dst_file)
fclose(audio_dst_file);
-if (api_mode == API_MODE_OLD)
-avcodec_free_frame(&frame);
-else
-av_frame_free(&frame);
+av_frame_free(&frame);
av_free(video_dst_data[0]);
return ret < 0;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu: Drop old deprecated AVOption API
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5
18:25:31 2015 +0200| [237cf3786ef7dea60818fc3bc464f72ed4b4d833] | committer:
Hendrik Leppkes
lavu: Drop old deprecated AVOption API
Deprecated in 2011/10
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=237cf3786ef7dea60818fc3bc464f72ed4b4d833
---
libavutil/opt.c | 122 ---
libavutil/opt.h | 56 ---
libavutil/version.h |3 --
3 files changed, 181 deletions(-)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 22e6775..8d44e1f 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -41,13 +41,6 @@
#include
-#if FF_API_OLD_AVOPTIONS
-const AVOption *av_next_option(const void *obj, const AVOption *last)
-{
-return av_opt_next(obj, last);
-}
-#endif
-
const AVOption *av_opt_next(const void *obj, const AVOption *last)
{
const AVClass *class;
@@ -356,16 +349,6 @@ static int set_string_sample_fmt(void *obj, const AVOption
*o, const char *val,
AV_SAMPLE_FMT_NB, av_get_sample_fmt, "sample
format");
}
-#if FF_API_OLD_AVOPTIONS
-int av_set_string3(void *obj, const char *name, const char *val, int alloc,
const AVOption **o_out)
-{
-const AVOption *o = av_opt_find(obj, name, NULL, 0, 0);
-if (o_out)
-*o_out = o;
-return av_opt_set(obj, name, val, 0);
-}
-#endif
-
int av_opt_set(void *obj, const char *name, const char *val, int search_flags)
{
int ret = 0;
@@ -462,32 +445,6 @@ static int set_number(void *obj, const char *name, double
num, int den, int64_t
return write_number(obj, o, dst, num, den, intnum);
}
-#if FF_API_OLD_AVOPTIONS
-const AVOption *av_set_double(void *obj, const char *name, double n)
-{
-const AVOption *o = av_opt_find(obj, name, NULL, 0, 0);
-if (set_number(obj, name, n, 1, 1, 0) < 0)
-return NULL;
-return o;
-}
-
-const AVOption *av_set_q(void *obj, const char *name, AVRational n)
-{
-const AVOption *o = av_opt_find(obj, name, NULL, 0, 0);
-if (set_number(obj, name, n.num, n.den, 1, 0) < 0)
-return NULL;
-return o;
-}
-
-const AVOption *av_set_int(void *obj, const char *name, int64_t n)
-{
-const AVOption *o = av_opt_find(obj, name, NULL, 0, 0);
-if (set_number(obj, name, 1, 1, n, 0) < 0)
-return NULL;
-return o;
-}
-#endif
-
int av_opt_set_int(void *obj, const char *name, int64_t val, int search_flags)
{
return set_number(obj, name, 1, 1, val, search_flags);
@@ -627,47 +584,6 @@ int av_opt_set_channel_layout(void *obj, const char *name,
int64_t cl, int searc
return 0;
}
-#if FF_API_OLD_AVOPTIONS
-/**
- *
- * @param buf a buffer which is used for returning non string values as
strings, can be NULL
- * @param buf_len allocated length in bytes of buf
- */
-const char *av_get_string(void *obj, const char *name, const AVOption **o_out,
char *buf, int buf_len)
-{
-const AVOption *o = av_opt_find(obj, name, NULL, 0,
AV_OPT_SEARCH_CHILDREN);
-void *dst;
-uint8_t *bin;
-int len, i;
-if (!o)
-return NULL;
-if (o->type != AV_OPT_TYPE_STRING && (!buf || !buf_len))
-return NULL;
-
-dst= ((uint8_t*)obj) + o->offset;
-if (o_out) *o_out= o;
-
-switch (o->type) {
-case AV_OPT_TYPE_FLAGS: snprintf(buf, buf_len, "0x%08X",*(int
*)dst);break;
-case AV_OPT_TYPE_INT: snprintf(buf, buf_len, "%d" , *(int
*)dst);break;
-case AV_OPT_TYPE_INT64: snprintf(buf, buf_len, "%"PRId64,
*(int64_t*)dst);break;
-case AV_OPT_TYPE_FLOAT: snprintf(buf, buf_len, "%f" , *(float
*)dst);break;
-case AV_OPT_TYPE_DOUBLE:snprintf(buf, buf_len, "%f" , *(double
*)dst);break;
-case AV_OPT_TYPE_RATIONAL: snprintf(buf, buf_len, "%d/%d",
((AVRational*)dst)->num, ((AVRational*)dst)->den);break;
-case AV_OPT_TYPE_CONST: snprintf(buf, buf_len, "%f" ,
o->default_val.dbl);break;
-case AV_OPT_TYPE_STRING:return *(void**)dst;
-case AV_OPT_TYPE_BINARY:
-len = *(int*)(((uint8_t *)dst) + sizeof(uint8_t *));
-if (len >= (buf_len + 1)/2) return NULL;
-bin = *(uint8_t**)dst;
-for (i = 0; i < len; i++) snprintf(buf + i*2, 3, "%02X", bin[i]);
-break;
-default: return NULL;
-}
-return buf;
-}
-#endif
-
int av_opt_set_dict_val(void *obj, const char *name, const AVDictionary *val,
int search_flags)
{
void *target_obj;
@@ -782,44 +698,6 @@ error:
return -1;
}
-#if FF_API_OLD_AVOPTIONS
-double av_get_double(void *obj, const char *name, const AVOption **o_out)
-{
-int64_t intnum=1;
-double num=1;
-int den=1;
-
-if (get_number(obj, name, o_out, &num, &den, &intnum, 0) < 0)
-return NAN;
-return num*intnum/den;
-}
-
-AVRational av_get_q(void *obj, const char *name, const AVOption **o_out)
-{
-int64_t intnum=1;
-double num=1;
-int den=1;
-
-if (get_number(obj, name, o_out, &num, &den, &intnum, 0) < 0)
-return (
[FFmpeg-cvslog] avformat/mp3dec: Make MP3 seek fast
ffmpeg | branch: master | Andy Wu | Mon Aug 31
17:08:30 2015 -0700| [c43bd08f8b043df7e18110e5344283c37b8380c1] | committer: wm4
avformat/mp3dec: Make MP3 seek fast
When AVFMT_FLAG_FAST_SEEK is specified, make MP3 seek operation as
fast as possible.
When no "-usetoc" is specified, the default operation is using TOC
if available; otherwise, uses linear interpolation. This is useful
when seeking a large MP3 file with no TOC available. One example is
Podcast, many MP3 files are large, but no CBR/VBR tags. Most of
them are actually CBR. Even in VBR cases, this option sacrifices the
accuracy of playback time in exchange for responsiveness.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c43bd08f8b043df7e18110e5344283c37b8380c1
---
libavformat/mp3dec.c | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 007c6ea..d3080d7 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -342,7 +342,7 @@ static int mp3_read_header(AVFormatContext *s)
int i;
if (mp3->usetoc < 0)
-mp3->usetoc = (s->flags & AVFMT_FLAG_FAST_SEEK) ? 0 : 2;
+mp3->usetoc = (s->flags & AVFMT_FLAG_FAST_SEEK) ? 1 : 2;
st = avformat_new_stream(s, NULL);
if (!st)
@@ -489,19 +489,26 @@ static int mp3_seek(AVFormatContext *s, int stream_index,
int64_t timestamp,
AVStream *st = s->streams[0];
int64_t ret = av_index_search_timestamp(st, timestamp, flags);
int64_t best_pos;
+int fast_seek = (s->flags & AVFMT_FLAG_FAST_SEEK) ? 1 : 0;
+int64_t filesize = mp3->header_filesize;
if (mp3->usetoc == 2)
return -1; // generic index code
-if ( mp3->is_cbr
+if (filesize <= 0) {
+int64_t size = avio_size(s->pb);
+if (size > 0 && size > s->internal->data_offset)
+filesize = size - s->internal->data_offset;
+}
+
+if ( (mp3->is_cbr || fast_seek)
&& (mp3->usetoc == 0 || !mp3->xing_toc)
&& st->duration > 0
-&& mp3->header_filesize > s->internal->data_offset
-&& mp3->frames) {
+&& filesize > 0) {
ie = &ie1;
timestamp = av_clip64(timestamp, 0, st->duration);
ie->timestamp = timestamp;
-ie->pos = av_rescale(timestamp, mp3->header_filesize,
st->duration) + s->internal->data_offset;
+ie->pos = av_rescale(timestamp, filesize, st->duration) +
s->internal->data_offset;
} else if (mp3->xing_toc) {
if (ret < 0)
return ret;
@@ -515,7 +522,7 @@ static int mp3_seek(AVFormatContext *s, int stream_index,
int64_t timestamp,
if (best_pos < 0)
return best_pos;
-if (mp3->is_cbr && ie == &ie1) {
+if (mp3->is_cbr && ie == &ie1 && mp3->frames) {
int frame_duration = av_rescale(st->duration, 1, mp3->frames);
ie1.timestamp = frame_duration * av_rescale(best_pos -
s->internal->data_offset, mp3->frames, mp3->header_filesize);
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavfi: remove old graph parser API with different semantics
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5
18:34:17 2015 +0200| [3433228795744a31e0f583ab6bb060d027273cff] | committer:
Hendrik Leppkes
lavfi: remove old graph parser API with different semantics
This API hasn't been active since the last bump already.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3433228795744a31e0f583ab6bb060d027273cff
---
libavfilter/avfilter.h| 21 -
libavfilter/graphparser.c |8
libavfilter/version.h |3 ---
3 files changed, 32 deletions(-)
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index ce97eac..642aa83 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -937,7 +937,6 @@ AVFilterInOut *avfilter_inout_alloc(void);
*/
void avfilter_inout_free(AVFilterInOut **inout);
-#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI || !FF_API_OLD_GRAPH_PARSE
/**
* Add a graph described by a string to a graph.
*
@@ -959,26 +958,6 @@ void avfilter_inout_free(AVFilterInOut **inout);
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
AVFilterInOut *inputs, AVFilterInOut *outputs,
void *log_ctx);
-#else
-/**
- * Add a graph described by a string to a graph.
- *
- * @param graph the filter graph where to link the parsed graph context
- * @param filters string to be parsed
- * @param inputs pointer to a linked list to the inputs of the graph, may be
NULL.
- *If non-NULL, *inputs is updated to contain the list of open
inputs
- *after the parsing, should be freed with
avfilter_inout_free().
- * @param outputs pointer to a linked list to the outputs of the graph, may be
NULL.
- *If non-NULL, *outputs is updated to contain the list of open
outputs
- *after the parsing, should be freed with
avfilter_inout_free().
- * @return non negative on success, a negative AVERROR code on error
- * @deprecated Use avfilter_graph_parse_ptr() instead.
- */
-attribute_deprecated
-int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
- AVFilterInOut **inputs, AVFilterInOut **outputs,
- void *log_ctx);
-#endif
/**
* Add a graph described by a string to a graph.
diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c
index 9e6fe6a..d9f40d6 100644
--- a/libavfilter/graphparser.c
+++ b/libavfilter/graphparser.c
@@ -456,7 +456,6 @@ int avfilter_graph_parse2(AVFilterGraph *graph, const char
*filters,
return ret;
}
-#if HAVE_INCOMPATIBLE_LIBAV_ABI || !FF_API_OLD_GRAPH_PARSE
int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
AVFilterInOut *open_inputs,
AVFilterInOut *open_outputs, void *log_ctx)
@@ -518,13 +517,6 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char
*filters,
avfilter_inout_free(&open_inputs);
avfilter_inout_free(&open_outputs);
return ret;
-#else
-int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
- AVFilterInOut **inputs, AVFilterInOut **outputs,
- void *log_ctx)
-{
-return avfilter_graph_parse_ptr(graph, filters, inputs, outputs, log_ctx);
-#endif
}
int avfilter_graph_parse_ptr(AVFilterGraph *graph, const char *filters,
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 323d0fd..d87548e 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -64,9 +64,6 @@
#ifndef FF_API_OLD_FILTER_REGISTER
#define FF_API_OLD_FILTER_REGISTER (LIBAVFILTER_VERSION_MAJOR < 7)
#endif
-#ifndef FF_API_OLD_GRAPH_PARSE
-#define FF_API_OLD_GRAPH_PARSE (LIBAVFILTER_VERSION_MAJOR < 5)
-#endif
#ifndef FF_API_NOCONST_GET_NAME
#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7)
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/APIchanges: add 2.8 cut line
ffmpeg | branch: release/2.8 | Michael Niedermayer | Sat Sep 5 16:38:53 2015 +0200| [2710c14a83bcd6d82f3e068cc3990f9a44dee6aa] | committer: Michael Niedermayer doc/APIchanges: add 2.8 cut line Signed-off-by: Michael Niedermayer (cherry picked from commit 982e235d76d3b436e5a247e2083c7dec16040eee) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2710c14a83bcd6d82f3e068cc3990f9a44dee6aa --- doc/APIchanges |2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index aa92b69..e1d7d39 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,8 @@ libavutil: 2014-08-09 API changes, most recent first: + 8< - FFmpeg 2.8 was cut here 8< - + 2015-xx-xx - lavc 56.58.100 - vaapi.h Deprecate old VA-API context (vaapi_context) fields that were only set and used by libavcodec. They are all managed internally now. ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/APIchanges: Fill in missing fields and correct one lavu version
ffmpeg | branch: release/2.8 | Michael Niedermayer | Sat Sep 5 17:00:22 2015 +0200| [f598ca088ed8c659f457b4d03444c70b5f03c585] | committer: Michael Niedermayer doc/APIchanges: Fill in missing fields and correct one lavu version Signed-off-by: Michael Niedermayer (cherry picked from commit 0acd4e75fdad1b6656a8722e386679ec9f8b0ba7) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f598ca088ed8c659f457b4d03444c70b5f03c585 --- doc/APIchanges | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index e1d7d39..459fa5b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -17,27 +17,27 @@ API changes, most recent first: 8< - FFmpeg 2.8 was cut here 8< - -2015-xx-xx - lavc 56.58.100 - vaapi.h +2015-08-27 - 1dd854e1 - lavc 56.58.100 - vaapi.h Deprecate old VA-API context (vaapi_context) fields that were only set and used by libavcodec. They are all managed internally now. -2015-xx-xx - lavu 54.31.100 - pixfmt.h +2015-08-19 - 9f8e57ef - lavu 54.31.100 - pixfmt.h Add a unique pixel format for VA-API (AV_PIX_FMT_VAAPI) that indicates the nature of the underlying storage: a VA surface. This yields the same value as AV_PIX_FMT_VAAPI_VLD. Deprecate old VA-API related pixel formats: AV_PIX_FMT_VAAPI_MOCO, AV_PIX_FMT_VAAPI_IDCT, AV_PIX_FMT_VAAPI_VLD. -2015-xx-xx - lavu 54.30.0 - xxx - Add av_blowfish_alloc(). - xxx - Add av_rc4_alloc(). - xxx - Add av_xtea_alloc(). - xxx - Add av_des_alloc(). +2015-08-02 - lavu 54.30.100 / 54.17.0 + 9ed59f1 / 7a7df34c - Add av_blowfish_alloc(). + a130ec9 / ae365453 - Add av_rc4_alloc(). + 9ca1997 / 5d8bea3b - Add av_xtea_alloc(). + 3cf08e9 / d9e8b47e - Add av_des_alloc(). -2015-xx-xx - lavc 56.35.0 - avcodec.h - x - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*. - x - Rename CODEC_CAP_* defines to AV_CODEC_CAP_*. - x - Rename FF_INPUT_BUFFER_PADDING_SIZE and FF_MIN_BUFFER_SIZE +2015-07-27 - lavc 56.56.100 / 56.35.0 - avcodec.h + 94d68a4 / 7c6eb0a1 - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*. + 444e987 / def97856 - Rename CODEC_CAP_* defines to AV_CODEC_CAP_*. + 29d147c / 059a9348 - Rename FF_INPUT_BUFFER_PADDING_SIZE and FF_MIN_BUFFER_SIZE to AV_INPUT_BUFFER_PADDING_SIZE and AV_INPUT_BUFFER_MIN_SIZE. 2015-07-22 - c40ecff - lavc 56.51.100 - avcodec.h ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec: remove FF_API_DV_FRAME_PROFILE cruft
ffmpeg | branch: master | James Almer | Sat Sep 5 14:08:32
2015 -0300| [251fb7dcd4865a9821fc238dbcc674e57080c91e] | committer: James Almer
avcodec: remove FF_API_DV_FRAME_PROFILE cruft
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=251fb7dcd4865a9821fc238dbcc674e57080c91e
---
libavcodec/dv_profile.c |8
libavcodec/dv_profile.h |9 -
libavcodec/version.h|3 ---
3 files changed, 20 deletions(-)
diff --git a/libavcodec/dv_profile.c b/libavcodec/dv_profile.c
index e336e08..66505c8 100644
--- a/libavcodec/dv_profile.c
+++ b/libavcodec/dv_profile.c
@@ -297,14 +297,6 @@ const AVDVProfile* ff_dv_frame_profile(AVCodecContext*
codec, const AVDVProfile
return NULL;
}
-#if FF_API_DV_FRAME_PROFILE
-const AVDVProfile* avpriv_dv_frame_profile2(AVCodecContext* codec, const
AVDVProfile *sys,
-const uint8_t *frame, unsigned
buf_size)
-{
-return ff_dv_frame_profile(codec, sys, frame, buf_size);
-}
-#endif
-
const AVDVProfile *av_dv_frame_profile(const AVDVProfile *sys,
const uint8_t *frame, unsigned buf_size)
{
diff --git a/libavcodec/dv_profile.h b/libavcodec/dv_profile.h
index d22ad26..9380a66 100644
--- a/libavcodec/dv_profile.h
+++ b/libavcodec/dv_profile.h
@@ -58,15 +58,6 @@ typedef struct AVDVProfile {
const uint8_t (*audio_shuffle)[9]; /* PCM shuffling table */
} AVDVProfile;
-#if FF_API_DV_FRAME_PROFILE
-/**
- * @deprecated use av_dv_frame_profile()
- */
-attribute_deprecated
-const AVDVProfile* avpriv_dv_frame_profile2(AVCodecContext* codec, const
AVDVProfile *sys,
-const uint8_t* frame, unsigned
buf_size);
-#endif
-
/**
* Get a DV profile for the provided compressed frame.
*
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 7c8a169..b7b502a 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -161,9 +161,6 @@
/* XXX: don't forget to drop the -vismv documentation */
#define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 57)
#endif
-#ifndef FF_API_DV_FRAME_PROFILE
-#define FF_API_DV_FRAME_PROFILE (LIBAVCODEC_VERSION_MAJOR < 57)
-#endif
#ifndef FF_API_AUDIOENC_DELAY
#define FF_API_AUDIOENC_DELAY(LIBAVCODEC_VERSION_MAJOR < 58)
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavu: Drop FF_API_GET_CHANNEL_LAYOUT_COMPAT cruft
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5
20:36:19 2015 +0200| [d83dd630a09d310463b525c6471c8d8f47fd20ec] | committer:
Hendrik Leppkes
lavu: Drop FF_API_GET_CHANNEL_LAYOUT_COMPAT cruft
FATE refs changed to accomodate for the new default behavior of the function.
Numbers are now interpreted as a channel layout, instead of a number of
channels.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d83dd630a09d310463b525c6471c8d8f47fd20ec
---
libavutil/channel_layout.c| 38 --
libavutil/internal.h |4
libavutil/opt.c |4
libavutil/version.h |3 ---
tests/ref/fate/filter-formats | 10 +-
5 files changed, 5 insertions(+), 54 deletions(-)
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c
index f72b2cf..a59ba46 100644
--- a/libavutil/channel_layout.c
+++ b/libavutil/channel_layout.c
@@ -106,11 +106,7 @@ static const struct {
{ "downmix", 2, AV_CH_LAYOUT_STEREO_DOWNMIX, },
};
-#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
-static uint64_t get_channel_layout_single(const char *name, int name_len, int
compat)
-#else
static uint64_t get_channel_layout_single(const char *name, int name_len)
-#endif
{
int i;
char *end;
@@ -128,27 +124,8 @@ static uint64_t get_channel_layout_single(const char
*name, int name_len)
return (int64_t)1 << i;
i = strtol(name, &end, 10);
-#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
-if (compat) {
-if (end - name == name_len ||
-(end + 1 - name == name_len && *end == 'c')) {
-layout = av_get_default_channel_layout(i);
-if (end - name == name_len) {
-av_log(NULL, AV_LOG_WARNING,
- "Single channel layout '%.*s' is interpreted as a
number of channels, "
- "switch to the syntax '%.*sc' otherwise it will be
interpreted as a "
- "channel layout number in a later version\n",
- name_len, name, name_len, name);
-}
-return layout;
-}
-} else {
-#endif
if ((end + 1 - name == name_len && *end == 'c'))
return av_get_default_channel_layout(i);
-#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
-}
-#endif
layout = strtoll(name, &end, 0);
if (end - name == name_len)
@@ -156,11 +133,7 @@ static uint64_t get_channel_layout_single(const char
*name, int name_len)
return 0;
}
-#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
-uint64_t ff_get_channel_layout(const char *name, int compat)
-#else
uint64_t av_get_channel_layout(const char *name)
-#endif
{
const char *n, *e;
const char *name_end = name + strlen(name);
@@ -168,11 +141,7 @@ uint64_t av_get_channel_layout(const char *name)
for (n = name; n < name_end; n = e + 1) {
for (e = n; e < name_end && *e != '+' && *e != '|'; e++);
-#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
-layout_single = get_channel_layout_single(n, e - n, compat);
-#else
layout_single = get_channel_layout_single(n, e - n);
-#endif
if (!layout_single)
return 0;
layout |= layout_single;
@@ -180,13 +149,6 @@ uint64_t av_get_channel_layout(const char *name)
return layout;
}
-#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
-uint64_t av_get_channel_layout(const char *name)
-{
-return ff_get_channel_layout(name, 1);
-}
-#endif
-
void av_bprint_channel_layout(struct AVBPrint *bp,
int nb_channels, uint64_t channel_layout)
{
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 047f742..13dbd3b 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -276,10 +276,6 @@ static av_always_inline av_const int avpriv_mirror(int x,
int w)
return x;
}
-#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
-uint64_t ff_get_channel_layout(const char *name, int compat);
-#endif
-
void ff_check_pixfmt_descriptors(void);
extern const uint8_t ff_reverse[256];
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 8d44e1f..4030fa8 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -395,11 +395,7 @@ int av_opt_set(void *obj, const char *name, const char
*val, int search_flags)
if (!val || !strcmp(val, "none")) {
*(int64_t *)dst = 0;
} else {
-#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
-int64_t cl = ff_get_channel_layout(val, 0);
-#else
int64_t cl = av_get_channel_layout(val);
-#endif
if (!cl) {
av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\"
as channel layout\n", val);
ret = AVERROR(EINVAL);
diff --git a/libavutil/version.h b/libavutil/version.h
index 2f4d2ef..108e1c7 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -87,9 +87,6 @@
#ifndef FF_API_VDPAU
#define FF_API_VDPAU(LIBAVUTIL_VERSION_MAJOR < 56)
#endif
-#ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
-#define FF_API_GET_CHANNE
[FFmpeg-cvslog] avutil/pixfmt: remove duplicate AVPixelFormat values
ffmpeg | branch: master | James Almer | Sat Sep 5 13:36:09
2015 -0300| [c956cb2c02563ca87c7feec532c1c63a6385fccf] | committer: James Almer
avutil/pixfmt: remove duplicate AVPixelFormat values
Reviewed-by: Paul B Mahol
Reviewed-by: Hendrik Leppkes
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c956cb2c02563ca87c7feec532c1c63a6385fccf
---
libavutil/pixfmt.h | 67 +++-
1 file changed, 9 insertions(+), 58 deletions(-)
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 0dc8292..79b15e0 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -178,13 +178,6 @@ enum AVPixelFormat {
AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per
2x1 Y samples), big-endian
AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per
2x1 Y samples), little-endian
AV_PIX_FMT_VDA_VLD,///< hardware decoding through VDA
-
-#ifdef AV_PIX_FMT_ABI_GIT_MASTER
-AV_PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B,
16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B,
16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R,
16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-AV_PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R,
16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
AV_PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp
AV_PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big-endian
AV_PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little-endian
@@ -192,15 +185,8 @@ enum AVPixelFormat {
AV_PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little-endian
AV_PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big-endian
AV_PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little-endian
-
-/**
- * duplicated pixel formats for compatibility with libav.
- * FFmpeg supports these formats since May 8 2012 and Jan 28 2012 (commits
f9ca1ac7 and 143a5c55)
- * Libav added them Oct 12 2012 with incompatible values (commit 6d5600e85)
- */
-AV_PIX_FMT_YUVA422P_LIBAV, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample
per 2x1 Y & A samples)
-AV_PIX_FMT_YUVA444P_LIBAV, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample
per 1x1 Y & A samples)
-
+AV_PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per
2x1 Y & A samples)
+AV_PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per
1x1 Y & A samples)
AV_PIX_FMT_YUVA420P9BE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample
per 2x2 Y & A samples), big-endian
AV_PIX_FMT_YUVA420P9LE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample
per 2x2 Y & A samples), little-endian
AV_PIX_FMT_YUVA422P9BE, ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample
per 2x1 Y & A samples), big-endian
@@ -228,16 +214,10 @@ enum AVPixelFormat {
AV_PIX_FMT_NV20LE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr &
Cb sample per 2x1 Y samples), little-endian
AV_PIX_FMT_NV20BE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr &
Cb sample per 2x1 Y samples), big-endian
-/**
- * duplicated pixel formats for compatibility with libav.
- * FFmpeg supports these formats since Sat Sep 24 06:01:45 2011 +0200
(commits 9569a3c9f41387a8c7d1ce97d8693520477a66c3)
- * also see Fri Nov 25 01:38:21 2011 +0100
92afb431621c79155fcb7171d26f137eb1bee028
- * Libav added them Sun Mar 16 23:05:47 2014 +0100 with incompatible
values (commit 1481d24c3a0abf81e1d7a514547bd5305232be30)
- */
-AV_PIX_FMT_RGBA64BE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16R,
16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as
big-endian
-AV_PIX_FMT_RGBA64LE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16R,
16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as
little-endian
-AV_PIX_FMT_BGRA64BE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16B,
16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as
big-endian
-AV_PIX_FMT_BGRA64LE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16B,
16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as
little-endian
+AV_PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G,
16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+AV_PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G,
16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
+AV_PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G,
16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
+AV_PIX_FMT_BGRA64LE, ///< packed RGBA 1
[FFmpeg-cvslog] avcodec: remove deprecated old audio decode API
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5
21:07:25 2015 +0200| [2c8ee2547ef10bc95a7fe5ceaef1c42802b1e2af] | committer:
Hendrik Leppkes
avcodec: remove deprecated old audio decode API
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c8ee2547ef10bc95a7fe5ceaef1c42802b1e2af
---
libavcodec/avcodec.h | 60 --
libavcodec/utils.c | 45 -
libavcodec/version.h |3 ---
3 files changed, 108 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 22aeca3..bc9db05 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4145,66 +4145,6 @@ int avcodec_enum_to_chroma_pos(int *xpos, int *ypos,
enum AVChromaLocation pos);
*/
enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos);
-#if FF_API_OLD_DECODE_AUDIO
-/**
- * Wrapper function which calls avcodec_decode_audio4.
- *
- * @deprecated Use avcodec_decode_audio4 instead.
- *
- * Decode the audio frame of size avpkt->size from avpkt->data into samples.
- * Some decoders may support multiple frames in a single AVPacket, such
- * decoders would then just decode the first frame. In this case,
- * avcodec_decode_audio3 has to be called again with an AVPacket that contains
- * the remaining data in order to decode the second frame etc.
- * If no frame
- * could be outputted, frame_size_ptr is zero. Otherwise, it is the
- * decompressed frame size in bytes.
- *
- * @warning You must set frame_size_ptr to the allocated size of the
- * output buffer before calling avcodec_decode_audio3().
- *
- * @warning The input buffer must be FF_INPUT_BUFFER_PADDING_SIZE larger than
- * the actual read bytes because some optimized bitstream readers read 32 or 64
- * bits at once and could read over the end.
- *
- * @warning The end of the input buffer avpkt->data should be set to 0 to
ensure that
- * no overreading happens for damaged MPEG streams.
- *
- * @warning You must not provide a custom get_buffer() when using
- * avcodec_decode_audio3(). Doing so will override it with
- * avcodec_default_get_buffer. Use avcodec_decode_audio4() instead,
- * which does allow the application to provide a custom get_buffer().
- *
- * @note You might have to align the input buffer avpkt->data and output buffer
- * samples. The alignment requirements depend on the CPU: On some CPUs it isn't
- * necessary at all, on others it won't work at all if not aligned and on
others
- * it will work but it will have an impact on performance.
- *
- * In practice, avpkt->data should have 4 byte alignment at minimum and
- * samples should be 16 byte aligned unless the CPU doesn't need it
- * (AltiVec and SSE do).
- *
- * @note Codecs which have the CODEC_CAP_DELAY capability set have a delay
- * between input and output, these need to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to return the remaining frames.
- *
- * @param avctx the codec context
- * @param[out] samples the output buffer, sample type in avctx->sample_fmt
- * If the sample format is planar, each channel plane will
- * be the same size, with no padding between channels.
- * @param[in,out] frame_size_ptr the output buffer size in bytes
- * @param[in] avpkt The input AVPacket containing the input buffer.
- *You can create such packet with av_init_packet() and by then
setting
- *data and size, some decoders might in addition need other fields.
- *All decoders are designed to use the least fields possible
though.
- * @return On error a negative value is returned, otherwise the number of bytes
- * used or zero if no frame data was decompressed (used) from the input
AVPacket.
- */
-attribute_deprecated int avcodec_decode_audio3(AVCodecContext *avctx, int16_t
*samples,
- int *frame_size_ptr,
- AVPacket *avpkt);
-#endif
-
/**
* Decode the audio frame of size avpkt->size from avpkt->data into frame.
*
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index cfc5613..b6312b2 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -2280,51 +2280,6 @@ fail:
return ret;
}
-#if FF_API_OLD_DECODE_AUDIO
-int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t
*samples,
- int *frame_size_ptr,
- AVPacket *avpkt)
-{
-AVFrame *frame = av_frame_alloc();
-int ret, got_frame = 0;
-
-if (!frame)
-return AVERROR(ENOMEM);
-
-ret = avcodec_decode_audio4(avctx, frame, &got_frame, avpkt);
-
-if (ret >= 0 && got_frame) {
-int ch, plane_size;
-int planar= av_sample_fmt_is_planar(avctx->sample_fmt);
-int data_size = av_samples_get_buffer_size(&plane_size,
avctx->channels,
- frame->nb_samples,
-
[FFmpeg-cvslog] Postpone removal of API changes from within the last two years
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 21:21:20 2015 +0200| [590ea32e54eebbf8d69c2e9d97d92727d22bb88a] | committer: Hendrik Leppkes Postpone removal of API changes from within the last two years > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=590ea32e54eebbf8d69c2e9d97d92727d22bb88a --- libavcodec/version.h |6 +++--- libavformat/version.h |4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/version.h b/libavcodec/version.h index 51f5b98..0db852d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -53,10 +53,10 @@ */ #ifndef FF_API_VIMA_DECODER -#define FF_API_VIMA_DECODER (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_VIMA_DECODER (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_AUDIO_CONVERT -#define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_AUDIO_CONVERT (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_AVCODEC_RESAMPLE #define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT @@ -147,7 +147,7 @@ #endif #ifndef FF_API_VISMV /* XXX: don't forget to drop the -vismv documentation */ -#define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 57) +#define FF_API_VISMV (LIBAVCODEC_VERSION_MAJOR < 58) #endif #ifndef FF_API_AUDIOENC_DELAY #define FF_API_AUDIOENC_DELAY(LIBAVCODEC_VERSION_MAJOR < 58) diff --git a/libavformat/version.h b/libavformat/version.h index c6f1d6b..3acb898 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -63,10 +63,10 @@ #define FF_API_LAVF_CODEC_TB(LIBAVFORMAT_VERSION_MAJOR < 58) #endif #ifndef FF_API_URL_FEOF -#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 57) +#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 58) #endif #ifndef FF_API_PROBESIZE_32 -#define FF_API_PROBESIZE_32 (LIBAVFORMAT_VERSION_MAJOR < 57) +#define FF_API_PROBESIZE_32 (LIBAVFORMAT_VERSION_MAJOR < 58) #endif #ifndef FF_API_R_FRAME_RATE ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec: remove deprecated old video encode API
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5
21:12:27 2015 +0200| [76cac7ed45fbb67edfb8c296798b6b83466d66f7] | committer:
Hendrik Leppkes
avcodec: remove deprecated old video encode API
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76cac7ed45fbb67edfb8c296798b6b83466d66f7
---
libavcodec/avcodec.h | 20
libavcodec/utils.c | 42 --
libavcodec/version.h |3 ---
3 files changed, 65 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 35e7e60..1f40ea6 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4600,26 +4600,6 @@ AVCodec *avcodec_find_encoder_by_name(const char *name);
int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
const AVFrame *frame, int *got_packet_ptr);
-#if FF_API_OLD_ENCODE_VIDEO
-/**
- * @deprecated use avcodec_encode_video2() instead.
- *
- * Encode a video frame from pict into buf.
- * The input picture should be
- * stored using a specific format, namely avctx.pix_fmt.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer for the bitstream of encoded frame
- * @param[in] buf_size the size of the output buffer in bytes
- * @param[in] pict the input picture to encode
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used from the output buffer.
- */
-attribute_deprecated
-int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
- const AVFrame *pict);
-#endif
-
/**
* Encode a frame of video.
*
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 549e579..0b8b5a7 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1813,48 +1813,6 @@ end:
return ret;
}
-#if FF_API_OLD_ENCODE_VIDEO
-int attribute_align_arg avcodec_encode_video(AVCodecContext *avctx, uint8_t
*buf, int buf_size,
- const AVFrame *pict)
-{
-AVPacket pkt;
-int ret, got_packet = 0;
-
-if (buf_size < AV_INPUT_BUFFER_MIN_SIZE) {
-av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n");
-return -1;
-}
-
-av_init_packet(&pkt);
-pkt.data = buf;
-pkt.size = buf_size;
-
-ret = avcodec_encode_video2(avctx, &pkt, pict, &got_packet);
-#if FF_API_CODED_FRAME
-FF_DISABLE_DEPRECATION_WARNINGS
-if (!ret && got_packet && avctx->coded_frame) {
-avctx->coded_frame->pts = pkt.pts;
-avctx->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY);
-if (avctx->codec->capabilities & AV_CODEC_CAP_INTRA_ONLY)
-avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
-}
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
-/* free any side data since we cannot return it */
-if (pkt.side_data_elems > 0) {
-int i;
-for (i = 0; i < pkt.side_data_elems; i++)
-av_free(pkt.side_data[i].data);
-av_freep(&pkt.side_data);
-pkt.side_data_elems = 0;
-}
-
-return ret ? ret : pkt.size;
-}
-
-#endif
-
int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
AVPacket *avpkt,
const AVFrame *frame,
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 5a76b7f..6d3e3c5 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -55,9 +55,6 @@
#ifndef FF_API_VIMA_DECODER
#define FF_API_VIMA_DECODER (LIBAVCODEC_VERSION_MAJOR < 57)
#endif
-#ifndef FF_API_OLD_ENCODE_VIDEO
-#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 57)
-#endif
#ifndef FF_API_CODEC_ID
#define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 57)
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec: remove deprecated old audio encode API
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5
21:11:44 2015 +0200| [64c33f9624eeed375e7a73fba46700d7ba18adc8] | committer:
Hendrik Leppkes
avcodec: remove deprecated old audio encode API
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64c33f9624eeed375e7a73fba46700d7ba18adc8
---
libavcodec/avcodec.h | 30 -
libavcodec/internal.h |8 -
libavcodec/utils.c| 89 -
libavcodec/version.h |3 --
4 files changed, 130 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index bc9db05..35e7e60 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4558,36 +4558,6 @@ AVCodec *avcodec_find_encoder(enum AVCodecID id);
*/
AVCodec *avcodec_find_encoder_by_name(const char *name);
-#if FF_API_OLD_ENCODE_AUDIO
-/**
- * Encode an audio frame from samples into buf.
- *
- * @deprecated Use avcodec_encode_audio2 instead.
- *
- * @note The output buffer should be at least FF_MIN_BUFFER_SIZE bytes large.
- * However, for codecs with avctx->frame_size equal to 0 (e.g. PCM) the user
- * will know how much space is needed because it depends on the value passed
- * in buf_size as described below. In that case a lower value can be used.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer
- * @param[in] buf_size the output buffer size
- * @param[in] samples the input buffer containing the samples
- * The number of samples read from this buffer is frame_size*channels,
- * both of which are defined in avctx.
- * For codecs which have avctx->frame_size equal to 0 (e.g. PCM) the number of
- * samples read from samples is equal to:
- * buf_size * 8 / (avctx->channels * av_get_bits_per_sample(avctx->codec_id))
- * This also implies that av_get_bits_per_sample() must not return 0 for these
- * codecs.
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used to encode the data read from the input buffer.
- */
-int attribute_deprecated avcodec_encode_audio(AVCodecContext *avctx,
- uint8_t *buf, int buf_size,
- const short *samples);
-#endif
-
/**
* Encode a frame of audio.
*
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index f93a196..ce4cf75 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -114,14 +114,6 @@ typedef struct AVCodecInternal {
*/
int allocate_progress;
-#if FF_API_OLD_ENCODE_AUDIO
-/**
- * Internal sample count used by avcodec_encode_audio() to fabricate pts.
- * Can be removed along with avcodec_encode_audio().
- */
-int64_t sample_count;
-#endif
-
/**
* An audio frame with less than required samples has been submitted and
* padded with silence. Reject all subsequent frames.
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index b6312b2..549e579 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1813,95 +1813,6 @@ end:
return ret;
}
-#if FF_API_OLD_ENCODE_AUDIO
-int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
- uint8_t *buf, int buf_size,
- const short *samples)
-{
-AVPacket pkt;
-AVFrame *frame;
-int ret, samples_size, got_packet;
-
-av_init_packet(&pkt);
-pkt.data = buf;
-pkt.size = buf_size;
-
-if (samples) {
-frame = av_frame_alloc();
-if (!frame)
-return AVERROR(ENOMEM);
-
-if (avctx->frame_size) {
-frame->nb_samples = avctx->frame_size;
-} else {
-/* if frame_size is not set, the number of samples must be
- * calculated from the buffer size */
-int64_t nb_samples;
-if (!av_get_bits_per_sample(avctx->codec_id)) {
-av_log(avctx, AV_LOG_ERROR, "avcodec_encode_audio() does not "
-"support this codec\n");
-av_frame_free(&frame);
-return AVERROR(EINVAL);
-}
-nb_samples = (int64_t)buf_size * 8 /
- (av_get_bits_per_sample(avctx->codec_id) *
- avctx->channels);
-if (nb_samples >= INT_MAX) {
-av_frame_free(&frame);
-return AVERROR(EINVAL);
-}
-frame->nb_samples = nb_samples;
-}
-
-/* it is assumed that the samples buffer is large enough based on the
- * relevant parameters */
-samples_size = av_samples_get_buffer_size(NULL, avctx->channels,
- frame->nb_samples,
- avctx->sample_fmt, 1);
-if ((ret = avcodec_fill_audio_frame(frame, avctx->channels,
-avctx->sample_fmt,
-
[FFmpeg-cvslog] avcodec: remove deprecated codec id aliases
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5
21:13:44 2015 +0200| [24e3bac52a2b9a32627418c3be3a12d0f01d935a] | committer:
Hendrik Leppkes
avcodec: remove deprecated codec id aliases
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24e3bac52a2b9a32627418c3be3a12d0f01d935a
---
libavcodec/avcodec.h |4 -
libavcodec/old_codec_ids.h | 397
libavcodec/utils.c |7 -
libavcodec/version.h |3 -
4 files changed, 411 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1f40ea6..074b2cd 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -552,10 +552,6 @@ enum AVCodecID {
AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4
Systems
* stream (only used by libavformat) */
AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams
containing only metadata information.
-
-#if FF_API_CODEC_ID
-#include "old_codec_ids.h"
-#endif
};
/**
diff --git a/libavcodec/old_codec_ids.h b/libavcodec/old_codec_ids.h
deleted file mode 100644
index c7aa0e0..000
--- a/libavcodec/old_codec_ids.h
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_OLD_CODEC_IDS_H
-#define AVCODEC_OLD_CODEC_IDS_H
-
-/*
- * This header exists to prevent new codec IDs from being accidentally added to
- * the deprecated list.
- * Do not include it directly. It will be removed on next major bump
- *
- * Do not add new items to this list. Use the AVCodecID enum instead.
- */
-
-CODEC_ID_NONE = AV_CODEC_ID_NONE,
-
-/* video codecs */
-CODEC_ID_MPEG1VIDEO,
-CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-#if FF_API_XVMC
-CODEC_ID_MPEG2VIDEO_XVMC,
-#endif
-CODEC_ID_H261,
-CODEC_ID_H263,
-CODEC_ID_RV10,
-CODEC_ID_RV20,
-CODEC_ID_MJPEG,
-CODEC_ID_MJPEGB,
-CODEC_ID_LJPEG,
-CODEC_ID_SP5X,
-CODEC_ID_JPEGLS,
-CODEC_ID_MPEG4,
-CODEC_ID_RAWVIDEO,
-CODEC_ID_MSMPEG4V1,
-CODEC_ID_MSMPEG4V2,
-CODEC_ID_MSMPEG4V3,
-CODEC_ID_WMV1,
-CODEC_ID_WMV2,
-CODEC_ID_H263P,
-CODEC_ID_H263I,
-CODEC_ID_FLV1,
-CODEC_ID_SVQ1,
-CODEC_ID_SVQ3,
-CODEC_ID_DVVIDEO,
-CODEC_ID_HUFFYUV,
-CODEC_ID_CYUV,
-CODEC_ID_H264,
-CODEC_ID_INDEO3,
-CODEC_ID_VP3,
-CODEC_ID_THEORA,
-CODEC_ID_ASV1,
-CODEC_ID_ASV2,
-CODEC_ID_FFV1,
-CODEC_ID_4XM,
-CODEC_ID_VCR1,
-CODEC_ID_CLJR,
-CODEC_ID_MDEC,
-CODEC_ID_ROQ,
-CODEC_ID_INTERPLAY_VIDEO,
-CODEC_ID_XAN_WC3,
-CODEC_ID_XAN_WC4,
-CODEC_ID_RPZA,
-CODEC_ID_CINEPAK,
-CODEC_ID_WS_VQA,
-CODEC_ID_MSRLE,
-CODEC_ID_MSVIDEO1,
-CODEC_ID_IDCIN,
-CODEC_ID_8BPS,
-CODEC_ID_SMC,
-CODEC_ID_FLIC,
-CODEC_ID_TRUEMOTION1,
-CODEC_ID_VMDVIDEO,
-CODEC_ID_MSZH,
-CODEC_ID_ZLIB,
-CODEC_ID_QTRLE,
-CODEC_ID_TSCC,
-CODEC_ID_ULTI,
-CODEC_ID_QDRAW,
-CODEC_ID_VIXL,
-CODEC_ID_QPEG,
-CODEC_ID_PNG,
-CODEC_ID_PPM,
-CODEC_ID_PBM,
-CODEC_ID_PGM,
-CODEC_ID_PGMYUV,
-CODEC_ID_PAM,
-CODEC_ID_FFVHUFF,
-CODEC_ID_RV30,
-CODEC_ID_RV40,
-CODEC_ID_VC1,
-CODEC_ID_WMV3,
-CODEC_ID_LOCO,
-CODEC_ID_WNV1,
-CODEC_ID_AASC,
-CODEC_ID_INDEO2,
-CODEC_ID_FRAPS,
-CODEC_ID_TRUEMOTION2,
-CODEC_ID_BMP,
-CODEC_ID_CSCD,
-CODEC_ID_MMVIDEO,
-CODEC_ID_ZMBV,
-CODEC_ID_AVS,
-CODEC_ID_SMACKVIDEO,
-CODEC_ID_NUV,
-CODEC_ID_KMVC,
-CODEC_ID_FLASHSV,
-CODEC_ID_CAVS,
-CODEC_ID_JPEG2000,
-CODEC_ID_VMNC,
-CODEC_ID_VP5,
-CODEC_ID_VP6,
-CODEC_ID_VP6F,
-CODEC_ID_TARGA,
-CODEC_ID_DSICINVIDEO,
-CODEC_ID_TIERTEXSEQVIDEO,
-CODEC_ID_TIFF,
-CODEC_ID_GIF,
-CODEC_ID_DXA,
-CODEC_ID_DNXHD,
-CODEC_ID_THP,
-CODEC_ID_SGI,
-CODEC_ID_C93,
-CODEC_ID_BETHSOFTVID,
-CODEC_ID_PTX,
-CODEC_ID_TXD,
-CODEC_ID_VP6A,
-CODEC_ID_AMV,
-CODEC_ID_VB,
-CODEC_ID_PCX,
-CODEC_ID_SUNRAST,
-CODEC_ID_INDEO4,
-CODEC_ID_INDEO5,
-CODEC_ID_MIMIC,
-CODEC_ID_RL2,
-CODEC_ID_ESCAPE124,
-CODEC_ID_DIRAC,
-CODEC_ID_BFI,
-CODEC_ID_
[FFmpeg-cvslog] Merge commit 'e88103a7f92cf27a2868b50acc8a9912f6088249'
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 21:35:46 2015 +0200| [160e92c8bfad9b6b4748b0d5f72f15a097ad2dc3] | committer: Hendrik Leppkes Merge commit 'e88103a7f92cf27a2868b50acc8a9912f6088249' * commit 'e88103a7f92cf27a2868b50acc8a9912f6088249': Bump major versions of all libraries Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=160e92c8bfad9b6b4748b0d5f72f15a097ad2dc3 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Bump major versions of all libraries
ffmpeg | branch: master | Vittorio Giovara | Tue
Jul 28 14:30:36 2015 +0100| [e88103a7f92cf27a2868b50acc8a9912f6088249] |
committer: Vittorio Giovara
Bump major versions of all libraries
Signed-off-by: Vittorio Giovara
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e88103a7f92cf27a2868b50acc8a9912f6088249
---
doc/APIchanges | 14 +++---
libavcodec/version.h|6 +++---
libavdevice/version.h |4 ++--
libavfilter/version.h |4 ++--
libavformat/version.h |4 ++--
libavresample/version.h |4 ++--
libavutil/version.h |4 ++--
libswscale/version.h|2 +-
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 7a65399..e500ac8 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,13 +2,13 @@ Never assume the API of libav* to be stable unless at least 1
month has passed
since the last major version increase.
The last version increases were:
-libavcodec:2014-08-09
-libavdevice: 2014-08-09
-libavfilter: 2014-08-09
-libavformat: 2014-08-09
-libavresample: 2014-08-09
-libswscale:2014-08-09
-libavutil: 2014-08-09
+libavcodec:2015-08-28
+libavdevice: 2015-08-28
+libavfilter: 2015-08-28
+libavformat: 2015-08-28
+libavresample: 2015-08-28
+libswscale:2015-08-28
+libavutil: 2015-08-28
API changes, most recent first:
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 517f0ea..8dfa735 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,9 +28,9 @@
#include "libavutil/version.h"
-#define LIBAVCODEC_VERSION_MAJOR 56
-#define LIBAVCODEC_VERSION_MINOR 35
-#define LIBAVCODEC_VERSION_MICRO 1
+#define LIBAVCODEC_VERSION_MAJOR 57
+#define LIBAVCODEC_VERSION_MINOR 0
+#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
diff --git a/libavdevice/version.h b/libavdevice/version.h
index 96e1ca9..0e047f7 100644
--- a/libavdevice/version.h
+++ b/libavdevice/version.h
@@ -27,8 +27,8 @@
#include "libavutil/version.h"
-#define LIBAVDEVICE_VERSION_MAJOR 55
-#define LIBAVDEVICE_VERSION_MINOR 2
+#define LIBAVDEVICE_VERSION_MAJOR 56
+#define LIBAVDEVICE_VERSION_MINOR 0
#define LIBAVDEVICE_VERSION_MICRO 0
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
diff --git a/libavfilter/version.h b/libavfilter/version.h
index ca99002..3cbd8f8 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -29,8 +29,8 @@
#include "libavutil/version.h"
-#define LIBAVFILTER_VERSION_MAJOR 5
-#define LIBAVFILTER_VERSION_MINOR 1
+#define LIBAVFILTER_VERSION_MAJOR 6
+#define LIBAVFILTER_VERSION_MINOR 0
#define LIBAVFILTER_VERSION_MICRO 0
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
diff --git a/libavformat/version.h b/libavformat/version.h
index 5e3b625..f8dbd6e 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -29,8 +29,8 @@
#include "libavutil/version.h"
-#define LIBAVFORMAT_VERSION_MAJOR 56
-#define LIBAVFORMAT_VERSION_MINOR 21
+#define LIBAVFORMAT_VERSION_MAJOR 57
+#define LIBAVFORMAT_VERSION_MINOR 0
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
diff --git a/libavresample/version.h b/libavresample/version.h
index 857d59c..2f204e0 100644
--- a/libavresample/version.h
+++ b/libavresample/version.h
@@ -27,8 +27,8 @@
#include "libavutil/version.h"
-#define LIBAVRESAMPLE_VERSION_MAJOR 2
-#define LIBAVRESAMPLE_VERSION_MINOR 1
+#define LIBAVRESAMPLE_VERSION_MAJOR 3
+#define LIBAVRESAMPLE_VERSION_MINOR 0
#define LIBAVRESAMPLE_VERSION_MICRO 0
#define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR,
\
diff --git a/libavutil/version.h b/libavutil/version.h
index 5a8853e..cc09bc7 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -53,8 +53,8 @@
* @{
*/
-#define LIBAVUTIL_VERSION_MAJOR 54
-#define LIBAVUTIL_VERSION_MINOR 17
+#define LIBAVUTIL_VERSION_MAJOR 55
+#define LIBAVUTIL_VERSION_MINOR 0
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff --git a/libswscale/version.h b/libswscale/version.h
index db74da1..701ce1b 100644
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -26,7 +26,7 @@
#include "libavutil/version.h"
-#define LIBSWSCALE_VERSION_MAJOR 3
+#define LIBSWSCALE_VERSION_MAJOR 4
#define LIBSWSCALE_VERSION_MINOR 0
#define LIBSWSCALE_VERSION_MICRO 0
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/vdpau: remove incompatible-libav-abi hack from vdpau_render_state struct
ffmpeg | branch: master | wm4 | Sat Sep 5 16:45:26
2015 -0300| [89b0a9f3fa9d6f32d99d03473ab1cb2110a7c9dd] | committer: James Almer
avcodec/vdpau: remove incompatible-libav-abi hack from vdpau_render_state struct
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89b0a9f3fa9d6f32d99d03473ab1cb2110a7c9dd
---
libavcodec/vdpau.h |7 ---
1 file changed, 7 deletions(-)
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index a42ca01..17cc263 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -231,10 +231,8 @@ struct vdpau_render_state {
int state; ///< Holds FF_VDPAU_STATE_* values.
-#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
/** picture parameter information for all supported codecs */
union AVVDPAUPictureInfo info;
-#endif
/** Describe size/location of the compressed video data.
Set to 0 when freeing bitstream_buffers. */
@@ -242,11 +240,6 @@ struct vdpau_render_state {
int bitstream_buffers_used;
/** The user is responsible for freeing this buffer using av_freep(). */
VdpBitstreamBuffer *bitstream_buffers;
-
-#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
-/** picture parameter information for all supported codecs */
-union AVVDPAUPictureInfo info;
-#endif
};
#endif
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] vp9: fix integer overflow in 10/12bpp DC-only calculation.
ffmpeg | branch: master | Ronald S. Bultje | Fri Sep 4
16:57:07 2015 -0400| [342bca7f02fc7c0e9c4adf43d0ab1fab31aac85b] | committer:
Ronald S. Bultje
vp9: fix integer overflow in 10/12bpp DC-only calculation.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=342bca7f02fc7c0e9c4adf43d0ab1fab31aac85b
---
libavcodec/vp9dsp_template.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/vp9dsp_template.c b/libavcodec/vp9dsp_template.c
index 5a8578a..9395a0c 100644
--- a/libavcodec/vp9dsp_template.c
+++ b/libavcodec/vp9dsp_template.c
@@ -1131,8 +1131,8 @@ static void
type_a##_##type_b##_##sz##x##sz##_add_c(uint8_t *_dst, \
\
stride /= sizeof(pixel); \
if (has_dconly && eob == 1) { \
-const int t = (((block[0] * 11585 + (1 << 13)) >> 14) \
- * 11585 + (1 << 13)) >> 14; \
+const int t = dctint) block[0] * 11585 + (1 << 13)) >> 14) \
+* 11585 + (1 << 13)) >> 14; \
block[0] = 0; \
for (i = 0; i < sz; i++) { \
for (j = 0; j < sz; j++) \
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] vp9: sync segmentation.absolute_vals between threads.
ffmpeg | branch: master | Ronald S. Bultje | Fri Sep 4 14:33:19 2015 -0400| [873dbc6758d84758403313fe457c170bbcbcc9e4] | committer: Ronald S. Bultje vp9: sync segmentation.absolute_vals between threads. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=873dbc6758d84758403313fe457c170bbcbcc9e4 --- libavcodec/vp9.c |1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index e6c5389..3bd2a0f 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -4335,6 +4335,7 @@ static int vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo s->ss_h = ssrc->ss_h; s->segmentation.enabled = ssrc->segmentation.enabled; s->segmentation.update_map = ssrc->segmentation.update_map; +s->segmentation.absolute_vals = ssrc->segmentation.absolute_vals; s->bytesperpixel = ssrc->bytesperpixel; s->bpp = ssrc->bpp; s->bpp_index = ssrc->bpp_index; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] vp9: check return value of ff_thread_ref_frame().
ffmpeg | branch: master | Ronald S. Bultje | Fri Sep 4
20:10:43 2015 -0400| [ae9344cb9ffad7272acdbcb9234d912bffa75716] | committer:
Ronald S. Bultje
vp9: check return value of ff_thread_ref_frame().
Fixes CID 1322309.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae9344cb9ffad7272acdbcb9234d912bffa75716
---
libavcodec/vp9.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 7624743..25e7419 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -4250,7 +4250,9 @@ static int vp9_decode_frame(AVCodecContext *ctx, void
*frame,
for (i = 0; i < 8; i++) {
if (s->refs[i].f->data[0])
ff_thread_release_buffer(ctx, &s->refs[i]);
-ff_thread_ref_frame(&s->refs[i], &s->next_refs[i]);
+if (s->next_refs[i].f->data[0] &&
+(res = ff_thread_ref_frame(&s->refs[i], &s->next_refs[i])) < 0)
+return res;
}
if (!s->invisible) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] vp9: do unscaled MC in scaled path if size of this reference matches.
ffmpeg | branch: master | Ronald S. Bultje | Fri Sep 4
15:03:30 2015 -0400| [9cdeb105a6d5a516fc42d97cf49e593cf9f6e6c4] | committer:
Ronald S. Bultje
vp9: do unscaled MC in scaled path if size of this reference matches.
This can happen if we do bidirectional MC, where one reference has the
same size as the current frame, but the other one doesn't.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9cdeb105a6d5a516fc42d97cf49e593cf9f6e6c4
---
libavcodec/vp9.c | 219 +-
1 file changed, 117 insertions(+), 102 deletions(-)
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 3bd2a0f..25a7b1d 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -2766,7 +2766,108 @@ static void intra_recon_16bpp(AVCodecContext *ctx,
ptrdiff_t y_off, ptrdiff_t uv
intra_recon(ctx, y_off, uv_off, 2);
}
+static av_always_inline void mc_luma_unscaled(VP9Context *s, vp9_mc_func
(*mc)[2],
+ uint8_t *dst, ptrdiff_t
dst_stride,
+ const uint8_t *ref, ptrdiff_t
ref_stride,
+ ThreadFrame *ref_frame,
+ ptrdiff_t y, ptrdiff_t x, const
VP56mv *mv,
+ int bw, int bh, int w, int h,
int bytesperpixel)
+{
+int mx = mv->x, my = mv->y, th;
+
+y += my >> 3;
+x += mx >> 3;
+ref += y * ref_stride + x * bytesperpixel;
+mx &= 7;
+my &= 7;
+// FIXME bilinear filter only needs 0/1 pixels, not 3/4
+// we use +7 because the last 7 pixels of each sbrow can be changed in
+// the longest loopfilter of the next sbrow
+th = (y + bh + 4 * !!my + 7) >> 6;
+ff_thread_await_progress(ref_frame, FFMAX(th, 0), 0);
+if (x < !!mx * 3 || y < !!my * 3 ||
+x + !!mx * 4 > w - bw || y + !!my * 4 > h - bh) {
+s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+ ref - !!my * 3 * ref_stride - !!mx * 3 *
bytesperpixel,
+ 160, ref_stride,
+ bw + !!mx * 7, bh + !!my * 7,
+ x - !!mx * 3, y - !!my * 3, w, h);
+ref = s->edge_emu_buffer + !!my * 3 * 160 + !!mx * 3 * bytesperpixel;
+ref_stride = 160;
+}
+mc[!!mx][!!my](dst, dst_stride, ref, ref_stride, bh, mx << 1, my << 1);
+}
+
+static av_always_inline void mc_chroma_unscaled(VP9Context *s, vp9_mc_func
(*mc)[2],
+uint8_t *dst_u, uint8_t *dst_v,
+ptrdiff_t dst_stride,
+const uint8_t *ref_u,
ptrdiff_t src_stride_u,
+const uint8_t *ref_v,
ptrdiff_t src_stride_v,
+ThreadFrame *ref_frame,
+ptrdiff_t y, ptrdiff_t x,
const VP56mv *mv,
+int bw, int bh, int w, int h,
int bytesperpixel)
+{
+int mx = mv->x << !s->ss_h, my = mv->y << !s->ss_v, th;
+
+y += my >> 4;
+x += mx >> 4;
+ref_u += y * src_stride_u + x * bytesperpixel;
+ref_v += y * src_stride_v + x * bytesperpixel;
+mx &= 15;
+my &= 15;
+// FIXME bilinear filter only needs 0/1 pixels, not 3/4
+// we use +7 because the last 7 pixels of each sbrow can be changed in
+// the longest loopfilter of the next sbrow
+th = (y + bh + 4 * !!my + 7) >> (6 - s->ss_v);
+ff_thread_await_progress(ref_frame, FFMAX(th, 0), 0);
+if (x < !!mx * 3 || y < !!my * 3 ||
+x + !!mx * 4 > w - bw || y + !!my * 4 > h - bh) {
+s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+ ref_u - !!my * 3 * src_stride_u - !!mx * 3 *
bytesperpixel,
+ 160, src_stride_u,
+ bw + !!mx * 7, bh + !!my * 7,
+ x - !!mx * 3, y - !!my * 3, w, h);
+ref_u = s->edge_emu_buffer + !!my * 3 * 160 + !!mx * 3 * bytesperpixel;
+mc[!!mx][!!my](dst_u, dst_stride, ref_u, 160, bh, mx, my);
+
+s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
+ ref_v - !!my * 3 * src_stride_v - !!mx * 3 *
bytesperpixel,
+ 160, src_stride_v,
+ bw + !!mx * 7, bh + !!my * 7,
+ x - !!mx * 3, y - !!my * 3, w, h);
+ref_v = s->edge_emu_buffer + !!my * 3 * 160 + !!mx * 3 * bytesperpixel;
+mc[!!mx][!!my](dst_v, dst_stride, ref_v, 160, bh, mx, my);
+} else {
+mc[!!mx][!!my](dst_u, dst_stride, ref_u, src_stride_u, bh, mx, my);
+mc[!!mx][!!my](dst_v, dst_stride, ref_v, src_stride_v, bh, mx, my);
+}
+}
+
+#define mc_luma_dir(s, mc, dst, dst_ls, src, src_ls, tref,
[FFmpeg-cvslog] vp9: always sync segmentation.feat between threads.
ffmpeg | branch: master | Ronald S. Bultje | Fri Sep 4
13:46:34 2015 -0400| [3d7173b509656b272462766e72ea1d987512320d] | committer:
Ronald S. Bultje
vp9: always sync segmentation.feat between threads.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d7173b509656b272462766e72ea1d987512320d
---
libavcodec/vp9.c |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 238185a..e6c5389 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -4340,10 +4340,8 @@ static int
vp9_decode_update_thread_context(AVCodecContext *dst, const AVCodecCo
s->bpp_index = ssrc->bpp_index;
memcpy(&s->prob_ctx, &ssrc->prob_ctx, sizeof(s->prob_ctx));
memcpy(&s->lf_delta, &ssrc->lf_delta, sizeof(s->lf_delta));
-if (ssrc->segmentation.enabled) {
-memcpy(&s->segmentation.feat, &ssrc->segmentation.feat,
- sizeof(s->segmentation.feat));
-}
+memcpy(&s->segmentation.feat, &ssrc->segmentation.feat,
+ sizeof(s->segmentation.feat));
return 0;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] vp9: fix edge copy for 10/12bpp frames.
ffmpeg | branch: master | Ronald S. Bultje | Fri Sep 4
15:50:15 2015 -0400| [1f7871ec428fa0c8247a4d1b7242ddafa2c07205] | committer:
Ronald S. Bultje
vp9: fix edge copy for 10/12bpp frames.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f7871ec428fa0c8247a4d1b7242ddafa2c07205
---
libavcodec/vp9.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 25a7b1d..7624743 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -3353,9 +3353,9 @@ static void decode_b(AVCodecContext *ctx, int row, int
col,
av_assert2(n <= 4);
if (w & bw) {
-s->dsp.mc[n][0][0][0][0](f->data[0] + yoff + o, f->linesize[0],
- s->tmp_y + o, 128, h, 0, 0);
-o += bw * bytesperpixel;
+s->dsp.mc[n][0][0][0][0](f->data[0] + yoff + o *
bytesperpixel, f->linesize[0],
+ s->tmp_y + o * bytesperpixel, 128, h,
0, 0);
+o += bw;
}
}
}
@@ -3368,11 +3368,11 @@ static void decode_b(AVCodecContext *ctx, int row, int
col,
av_assert2(n <= 4);
if (w & bw) {
-s->dsp.mc[n][0][0][0][0](f->data[1] + uvoff + o,
f->linesize[1],
- s->tmp_uv[0] + o, 128, h, 0, 0);
-s->dsp.mc[n][0][0][0][0](f->data[2] + uvoff + o,
f->linesize[2],
- s->tmp_uv[1] + o, 128, h, 0, 0);
-o += bw * bytesperpixel;
+s->dsp.mc[n][0][0][0][0](f->data[1] + uvoff + o *
bytesperpixel, f->linesize[1],
+ s->tmp_uv[0] + o * bytesperpixel,
128, h, 0, 0);
+s->dsp.mc[n][0][0][0][0](f->data[2] + uvoff + o *
bytesperpixel, f->linesize[2],
+ s->tmp_uv[1] + o * bytesperpixel,
128, h, 0, 0);
+o += bw;
}
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] vp9: fix type of iadst4_1d intermediates.
ffmpeg | branch: master | Ronald S. Bultje | Fri Sep 4
17:01:53 2015 -0400| [ef8740d8e58dc45950887305307206d27ad413fb] | committer:
Ronald S. Bultje
vp9: fix type of iadst4_1d intermediates.
Fixes integer overflows for extreme coefficient values in 10/12bpp content.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef8740d8e58dc45950887305307206d27ad413fb
---
libavcodec/vp9dsp_template.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/vp9dsp_template.c b/libavcodec/vp9dsp_template.c
index 9395a0c..4d810fe 100644
--- a/libavcodec/vp9dsp_template.c
+++ b/libavcodec/vp9dsp_template.c
@@ -1186,7 +1186,7 @@ static av_always_inline void idct4_1d(const dctcoef *in,
ptrdiff_t stride,
static av_always_inline void iadst4_1d(const dctcoef *in, ptrdiff_t stride,
dctcoef *out, int pass)
{
-int t0, t1, t2, t3;
+dctint t0, t1, t2, t3;
t0 = 5283 * IN(0) + 15212 * IN(2) + 9929 * IN(3);
t1 = 9929 * IN(0) - 5283 * IN(2) - 15212 * IN(3);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] vp9: fix rounding error in idct_8x8_ssse3.
ffmpeg | branch: master | Ronald S. Bultje | Sat Sep 5 13:36:56 2015 -0400| [086c9b78d42fa6909ceb5f1fba935cb4f2b5c89a] | committer: Ronald S. Bultje vp9: fix rounding error in idct_8x8_ssse3. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=086c9b78d42fa6909ceb5f1fba935cb4f2b5c89a --- libavcodec/x86/vp9itxfm.asm |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/x86/vp9itxfm.asm b/libavcodec/x86/vp9itxfm.asm index d9fb36f..e1cb637 100644 --- a/libavcodec/x86/vp9itxfm.asm +++ b/libavcodec/x86/vp9itxfm.asm @@ -527,10 +527,9 @@ IADST4_FN iadst, IADST4, iadst, IADST4, ssse3 pmulhrswm2, [pw_6270x2] ; m2=t2a pmulhrswm7, m1, [pw_16069x2]; m7=t7a pmulhrswm1, [pw_3196x2] ; m1=t4a -pmulhrswm5, m3, [pw_9102x2] ; m5=-t5a +pmulhrswm5, m3, [pw_m9102x2]; m5=t5a pmulhrswm3, [pw_13623x2]; m3=t6a SUMSUB_BAw, 5, 1, 4 ; m1=t4a+t5a (t4), m5=t4a-t5a (t5a) -SWAP 1, 5 SUMSUB_BAw, 3, 7, 4 ; m3=t7a+t6a (t7), m7=t7a-t6a (t6a) SUMSUB_BAw, 1, 7, 4 ; m1=t6a+t5a (t6), m7=t6a-t5a (t5) pmulhrswm1, W_11585x2_REG ; m1=t6 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec: fix make install after old_codec_ids.h removal
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 21:54:27 2015 +0200| [393b472362e5f56040b75b29c6835e56ddbd4f8a] | committer: Hendrik Leppkes avcodec: fix make install after old_codec_ids.h removal > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=393b472362e5f56040b75b29c6835e56ddbd4f8a --- libavcodec/Makefile |1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 407c6c3..dc80167 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -7,7 +7,6 @@ HEADERS = avcodec.h \ dv_profile.h \ d3d11va.h \ dxva2.h \ - old_codec_ids.h \ qsv.h \ vaapi.h \ vda.h \ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec: remove old_codec_ids.h from SKIPHEADERS as well
ffmpeg | branch: master | Hendrik Leppkes | Sat Sep 5 21:55:59 2015 +0200| [8042d6c49248c80af322d9ca92ee486e0acf510a] | committer: Hendrik Leppkes avcodec: remove old_codec_ids.h from SKIPHEADERS as well > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8042d6c49248c80af322d9ca92ee486e0acf510a --- libavcodec/Makefile |1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index dc80167..893fc96 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -908,7 +908,6 @@ SKIPHEADERS+= %_tablegen.h \ %_tables.h\ aac_tablegen_decl.h \ fft-internal.h\ - old_codec_ids.h \ tableprint.h \ tableprint_vlc.h \ $(ARCH)/vp56_arith.h \ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/x86/w64xmmtest: Fix another build failure
ffmpeg | branch: master | Michael Niedermayer | Sat
Sep 5 21:49:39 2015 +0200| [8d860f9a772ef717d5124f0c79e23b1a0c5e4d70] |
committer: Michael Niedermayer
avcodec/x86/w64xmmtest: Fix another build failure
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d860f9a772ef717d5124f0c79e23b1a0c5e4d70
---
libavcodec/x86/w64xmmtest.c |7 ---
1 file changed, 7 deletions(-)
diff --git a/libavcodec/x86/w64xmmtest.c b/libavcodec/x86/w64xmmtest.c
index 25e833f..94b3049 100644
--- a/libavcodec/x86/w64xmmtest.c
+++ b/libavcodec/x86/w64xmmtest.c
@@ -65,13 +65,6 @@ wrap(avcodec_encode_audio2(AVCodecContext *avctx,
got_packet_ptr);
}
-wrap(avcodec_encode_video(AVCodecContext *avctx,
- uint8_t *buf, int buf_size,
- const AVFrame *pict))
-{
-testxmmclobbers(avcodec_encode_video, avctx, buf, buf_size, pict);
-}
-
wrap(avcodec_encode_subtitle(AVCodecContext *avctx,
uint8_t *buf, int buf_size,
const AVSubtitle *sub))
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avfilter/vf_unsharp: use the name 's' for the pointer to the private context
ffmpeg | branch: master | Ganesh Ajjanagadde | Sat Sep
5 08:13:30 2015 -0700| [78995dc241ea3fcd794fa60559d56139a72e11a8] | committer:
Paul B Mahol
avfilter/vf_unsharp: use the name 's' for the pointer to the private context
Signed-off-by: Ganesh Ajjanagadde
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=78995dc241ea3fcd794fa60559d56139a72e11a8
---
libavfilter/vf_unsharp.c | 48 +++---
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/libavfilter/vf_unsharp.c b/libavfilter/vf_unsharp.c
index d5f5018..fb95e23 100644
--- a/libavfilter/vf_unsharp.c
+++ b/libavfilter/vf_unsharp.c
@@ -105,15 +105,15 @@ static void apply_unsharp( uint8_t *dst, int
dst_stride,
static int apply_unsharp_c(AVFilterContext *ctx, AVFrame *in, AVFrame *out)
{
AVFilterLink *inlink = ctx->inputs[0];
-UnsharpContext *unsharp = ctx->priv;
+UnsharpContext *s = ctx->priv;
int i, plane_w[3], plane_h[3];
UnsharpFilterParam *fp[3];
plane_w[0] = inlink->w;
-plane_w[1] = plane_w[2] = FF_CEIL_RSHIFT(inlink->w, unsharp->hsub);
+plane_w[1] = plane_w[2] = FF_CEIL_RSHIFT(inlink->w, s->hsub);
plane_h[0] = inlink->h;
-plane_h[1] = plane_h[2] = FF_CEIL_RSHIFT(inlink->h, unsharp->vsub);
-fp[0] = &unsharp->luma;
-fp[1] = fp[2] = &unsharp->chroma;
+plane_h[1] = plane_h[2] = FF_CEIL_RSHIFT(inlink->h, s->vsub);
+fp[0] = &s->luma;
+fp[1] = fp[2] = &s->chroma;
for (i = 0; i < 3; i++) {
apply_unsharp(out->data[i], out->linesize[i], in->data[i],
in->linesize[i], plane_w[i], plane_h[i], fp[i]);
}
@@ -135,19 +135,19 @@ static void set_filter_param(UnsharpFilterParam *fp, int
msize_x, int msize_y, f
static av_cold int init(AVFilterContext *ctx)
{
int ret = 0;
-UnsharpContext *unsharp = ctx->priv;
+UnsharpContext *s = ctx->priv;
-set_filter_param(&unsharp->luma, unsharp->lmsize_x, unsharp->lmsize_y,
unsharp->lamount);
-set_filter_param(&unsharp->chroma, unsharp->cmsize_x, unsharp->cmsize_y,
unsharp->camount);
+set_filter_param(&s->luma, s->lmsize_x, s->lmsize_y, s->lamount);
+set_filter_param(&s->chroma, s->cmsize_x, s->cmsize_y, s->camount);
-unsharp->apply_unsharp = apply_unsharp_c;
-if (!CONFIG_OPENCL && unsharp->opencl) {
+s->apply_unsharp = apply_unsharp_c;
+if (!CONFIG_OPENCL && s->opencl) {
av_log(ctx, AV_LOG_ERROR, "OpenCL support was not enabled in this
build, cannot be selected\n");
return AVERROR(EINVAL);
}
-if (CONFIG_OPENCL && unsharp->opencl) {
-unsharp->apply_unsharp = ff_opencl_apply_unsharp;
+if (CONFIG_OPENCL && s->opencl) {
+s->apply_unsharp = ff_opencl_apply_unsharp;
ret = ff_opencl_unsharp_init(ctx);
if (ret < 0)
return ret;
@@ -194,17 +194,17 @@ static int init_filter_param(AVFilterContext *ctx,
UnsharpFilterParam *fp, const
static int config_props(AVFilterLink *link)
{
-UnsharpContext *unsharp = link->dst->priv;
+UnsharpContext *s = link->dst->priv;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format);
int ret;
-unsharp->hsub = desc->log2_chroma_w;
-unsharp->vsub = desc->log2_chroma_h;
+s->hsub = desc->log2_chroma_w;
+s->vsub = desc->log2_chroma_h;
-ret = init_filter_param(link->dst, &unsharp->luma, "luma", link->w);
+ret = init_filter_param(link->dst, &s->luma, "luma", link->w);
if (ret < 0)
return ret;
-ret = init_filter_param(link->dst, &unsharp->chroma, "chroma",
FF_CEIL_RSHIFT(link->w, unsharp->hsub));
+ret = init_filter_param(link->dst, &s->chroma, "chroma",
FF_CEIL_RSHIFT(link->w, s->hsub));
if (ret < 0)
return ret;
@@ -221,19 +221,19 @@ static void free_filter_param(UnsharpFilterParam *fp)
static av_cold void uninit(AVFilterContext *ctx)
{
-UnsharpContext *unsharp = ctx->priv;
+UnsharpContext *s = ctx->priv;
-if (CONFIG_OPENCL && unsharp->opencl) {
+if (CONFIG_OPENCL && s->opencl) {
ff_opencl_unsharp_uninit(ctx);
}
-free_filter_param(&unsharp->luma);
-free_filter_param(&unsharp->chroma);
+free_filter_param(&s->luma);
+free_filter_param(&s->chroma);
}
static int filter_frame(AVFilterLink *link, AVFrame *in)
{
-UnsharpContext *unsharp = link->dst->priv;
+UnsharpContext *s = link->dst->priv;
AVFilterLink *outlink = link->dst->outputs[0];
AVFrame *out;
int ret = 0;
@@ -244,13 +244,13 @@ static int filter_frame(AVFilterLink *link, AVFrame *in)
return AVERROR(ENOMEM);
}
av_frame_copy_props(out, in);
-if (CONFIG_OPENCL && unsharp->opencl) {
+if (CONFIG_OPENCL && s->opencl) {
ret = ff_opencl_unsharp_process_inout_buf(link->dst, in, out);
if (ret < 0)
goto end;
}
-ret = unsharp->apply_unsharp(link->dst, in, out);
+ret = s->apply_unsharp(link->dst, in, out);
end:
av_frame
[FFmpeg-cvslog] configure: Remove reference to no longer existing avcodec_encode_video()
ffmpeg | branch: master | Michael Niedermayer | Sat Sep 5 22:25:58 2015 +0200| [69c344eed2742267541ddb748faee300bc8e97c3] | committer: Michael Niedermayer configure: Remove reference to no longer existing avcodec_encode_video() Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69c344eed2742267541ddb748faee300bc8e97c3 --- configure |1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 91f366e..32f4752 100755 --- a/configure +++ b/configure @@ -5580,7 +5580,6 @@ enabled xmm_clobber_test && -Wl,--wrap,avcodec_decode_video2 \ -Wl,--wrap,avcodec_decode_subtitle2 \ -Wl,--wrap,avcodec_encode_audio2 \ - -Wl,--wrap,avcodec_encode_video \ -Wl,--wrap,avcodec_encode_video2 \ -Wl,--wrap,avcodec_encode_subtitle\ -Wl,--wrap,swr_convert\ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] fate: increase the fuzz of the AAC encoder aref test
ffmpeg | branch: master | Rostislav Pehlivanov | Sat Sep 5 21:47:26 2015 +0100| [cf6fb6f3f7215cac30473729e7cee322c2286c4f] | committer: Rostislav Pehlivanov fate: increase the fuzz of the AAC encoder aref test Almost fine on SunOS without yasm but 5 wasn't enough. Signed-off-by: Rostislav Pehlivanov > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf6fb6f3f7215cac30473729e7cee322c2286c4f --- tests/fate/aac.mak |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 06b2497..163353a 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -148,7 +148,7 @@ fate-aac-aref-encode: REF = ./tests/data/asynth-44100-2.wav fate-aac-aref-encode: CMP_SHIFT = -4096 fate-aac-aref-encode: CMP_TARGET = 594 fate-aac-aref-encode: SIZE_TOLERANCE = 2464 -fate-aac-aref-encode: FUZZ = 5 +fate-aac-aref-encode: FUZZ = 6 FATE_AAC_ENCODE += fate-aac-ln-encode fate-aac-ln-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -strict -2 -c:a aac -aac_is 0 -aac_pns 0 -b:a 512k ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] tests/fate-run: Pass bitexact flags to enc_dec_pcm() output
ffmpeg | branch: master | Michael Niedermayer | Sat
Sep 5 23:32:50 2015 +0200| [3cb85ad4450b1c4b1343d2ee19572b6e572549ce] |
committer: Michael Niedermayer
tests/fate-run: Pass bitexact flags to enc_dec_pcm() output
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3cb85ad4450b1c4b1343d2ee19572b6e572549ce
---
tests/fate-run.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index c55609d..4aeb2e6 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -137,7 +137,7 @@ enc_dec_pcm(){
cleanfiles=$encfile
encfile=$(target_path ${encfile})
ffmpeg -i $src_file "$@" -f $out_fmt -y ${encfile} || return
-ffmpeg -flags +bitexact -fflags +bitexact -i ${encfile} -c:a
pcm_${pcm_fmt} -f ${dec_fmt} -
+ffmpeg -flags +bitexact -fflags +bitexact -i ${encfile} -c:a
pcm_${pcm_fmt} -fflags +bitexact -f ${dec_fmt} -
}
FLAGS="-flags +bitexact -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 2b30656 src/download: use a https based link for main "Browse" button
The branch, master has been updated via 2b30656b7048b1746d943a49fe1cc8c8a8502404 (commit) from fa2da62dde2e5589b4737117790d74cea793f681 (commit) - Log - commit 2b30656b7048b1746d943a49fe1cc8c8a8502404 Author: Michael Niedermayer AuthorDate: Sun Sep 6 01:21:41 2015 +0200 Commit: Michael Niedermayer CommitDate: Sun Sep 6 01:22:52 2015 +0200 src/download: use a https based link for main "Browse" button diff --git a/src/download b/src/download index 219030e..056736d 100644 --- a/src/download +++ b/src/download @@ -135,7 +135,7 @@ Snapshot -http://git.videolan.org/?p=ffmpeg.git;a=tree"; class="btn btn-success"> +https://github.com/FFmpeg/FFmpeg"; class="btn btn-success"> Browse --- Summary of changes: src/download | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] tests/fate: replace all -f md5 by framemd5
ffmpeg | branch: master | Michael Niedermayer | Sun Sep 6 00:08:08 2015 +0200| [61009a709c76ec2a8529c0fcf15057d82bed6454] | committer: Michael Niedermayer tests/fate: replace all -f md5 by framemd5 also limit dcinema-encode to 20 frames to avoid huge reference checksum lists Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=61009a709c76ec2a8529c0fcf15057d82bed6454 --- tests/fate/pcm.mak |2 +- tests/fate/voice.mak| 10 +- tests/ref/fate/dcinema-encode | 26 +- tests/ref/fate/g722-encode | 18 +- tests/ref/fate/g726-encode-2bit |9 - tests/ref/fate/g726-encode-3bit | 11 ++- tests/ref/fate/g726-encode-4bit | 12 +++- tests/ref/fate/g726-encode-5bit | 14 +- 8 files changed, 90 insertions(+), 12 deletions(-) diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak index 9ba4be5..e6502aa 100644 --- a/tests/fate/pcm.mak +++ b/tests/fate/pcm.mak @@ -25,7 +25,7 @@ fate-w64: CMD = crc -i $(TARGET_SAMPLES)/w64/w64-pcm16.w64 FATE_PCM-$(call ENCMUX, PCM_S24DAUD, DAUD) += fate-dcinema-encode fate-dcinema-encode: tests/data/asynth-96000-6.wav fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav -fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud +fate-dcinema-encode: CMD = enc_dec_pcm daud framemd5 s16le $(SRC) -c:a pcm_s24daud -aframes 20 FATE_FFMPEG += $(FATE_PCM-yes) FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM-yes) diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak index 44b5b93..7389c43 100644 --- a/tests/fate/voice.mak +++ b/tests/fate/voice.mak @@ -4,7 +4,7 @@ fate-g722dec-1: CMD = framecrc -i $(TARGET_SAMPLES)/g722/conf-adminmenu-162.g722 FATE_G722-$(call ENCMUX, ADPCM_G722, WAV) += fate-g722-encode fate-g722-encode: tests/data/asynth-16000-1.wav fate-g722-encode: SRC = tests/data/asynth-16000-1.wav -fate-g722-encode: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g722 +fate-g722-encode: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g722 FATE_VOICE-yes += $(FATE_G722-yes) fate-g722: $(FATE_G722) @@ -38,16 +38,16 @@ FATE_SAMPLES_AVCONV += $(FATE_G723_1-yes) fate-g723_1: $(FATE_G723_1) FATE_G726 += fate-g726-encode-2bit -fate-g726-encode-2bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 16k +fate-g726-encode-2bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b:a 16k FATE_G726 += fate-g726-encode-3bit -fate-g726-encode-3bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 24k +fate-g726-encode-3bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b:a 24k FATE_G726 += fate-g726-encode-4bit -fate-g726-encode-4bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 32k +fate-g726-encode-4bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b:a 32k FATE_G726 += fate-g726-encode-5bit -fate-g726-encode-5bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 40k +fate-g726-encode-5bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b:a 40k $(FATE_G726): tests/data/asynth-8000-1.wav $(FATE_G726): SRC = tests/data/asynth-8000-1.wav diff --git a/tests/ref/fate/dcinema-encode b/tests/ref/fate/dcinema-encode index 8aeb215..93ac172 100644 --- a/tests/ref/fate/dcinema-encode +++ b/tests/ref/fate/dcinema-encode @@ -1 +1,25 @@ -MD5=2d7c6897c315493647db159f4bfd6edc +#format: frame checksums +#version: 1 +#hash: MD5 +#tb 0: 1/96000 +#stream#, dts,pts, duration, size, hash +0, 0, 0, 341, 4092, 697cddfcd0e21f24782af0705b7048f3 +0,341,341, 341, 4092, a057b18cd493923fed33c18578f61e0b +0,682,682, 341, 4092, f4eacfd888566040067b8e5ce7d276c6 +0, 1023, 1023, 341, 4092, 4de78d332ce2047014880a110c160dc2 +0, 1364, 1364, 341, 4092, 138ee3fc206538feca6de3d6d62d08eb +0, 1705, 1705, 341, 4092, 187a2f2998aa1c0ba0130c57dd1d6c86 +0, 2046, 2046, 341, 4092, 54e6c3db8a5f8c09b47f025659a36b17 +0, 2387, 2387, 341, 4092, 8abfdf44a24c158429c71e01cee31e20 +0, 2728, 2728, 341, 4092, bd08f5018edc5dc4520739e913ed89a3 +0, 3069, 3069, 341, 4092, 9f60ba4275646344e4a9b3c647efffe9 +0, 3410, 3410, 341, 4092, 00cefc1f27230cdd06ecd43132e16327 +0, 3751, 3751, 341, 4092, d4d13047cd639ed722a4ae1bc1f06991 +0, 4092, 4092, 341, 4092, 16b227e4f968c11cba279506f00d5172 +0, 4433, 4433, 341, 4092, 70f4046f709fdd4d80e2f2ffc862f21a +0, 4774, 4774, 341, 4092, adbef4b4ef728f0c2a31b4b0baba50a0 +0, 5115, 5115, 341, 4092, fe009b6cc96b9d1098dcc5fba0e6b3fa +0, 5456, 5456, 341, 4092, 4462b2f1654c9b31fdd7ab04ffb84192 +0, 5797, 5797, 341, 4092, 2e96ba3bd13de03f9cfdc2b8c3ea0620 +0,
