[FFmpeg-cvslog] codec_desc: Add missing DXV entry
ffmpeg | branch: master | Vittorio Giovara | Mon
Sep 7 17:02:14 2015 +0200| [3b8e895237592fdaffe87cdcd204104200b9ccf9] |
committer: Vittorio Giovara
codec_desc: Add missing DXV entry
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b8e895237592fdaffe87cdcd204104200b9ccf9
---
libavcodec/codec_desc.c |7 +++
1 file changed, 7 insertions(+)
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 0919a89..c1be40b 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -1155,6 +1155,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("Vidvox Hap decoder"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
},
+{
+.id= AV_CODEC_ID_DXV,
+.type = AVMEDIA_TYPE_VIDEO,
+.name = "dxv",
+.long_name = NULL_IF_CONFIG_SMALL("Resolume DXV"),
+.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
+},
/* image codecs */
{
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '3b8e895237592fdaffe87cdcd204104200b9ccf9'
ffmpeg | branch: master | Hendrik Leppkes | Wed Sep 9 09:55:14 2015 +0200| [b421455ee09982b403a2b3428d2b01c835663ed7] | committer: Hendrik Leppkes Merge commit '3b8e895237592fdaffe87cdcd204104200b9ccf9' * commit '3b8e895237592fdaffe87cdcd204104200b9ccf9': codec_desc: Add missing DXV entry Merged-by: Hendrik Leppkes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b421455ee09982b403a2b3428d2b01c835663ed7 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] aaccoder: tweak PNS implementation further
ffmpeg | branch: master | Rostislav Pehlivanov | Wed Sep
9 10:44:33 2015 +0100| [da64bd6a992c5aa3b07d45412b34d26302e67c82] | committer:
Rostislav Pehlivanov
aaccoder: tweak PNS implementation further
This commit changes a few things about the noise substitution
logic:
- Brings back the quantization factor (reduced to 3) during
scalefactor index calculations.
- Rejects any zeroed bands. They should be inaudiable and it's
a waste transmitting the scalefactor indices for these.
- Uses swb_offsets instead of incrementing a 'start' with every
window group size.
- Rejects all PNS during short windows.
Overall improves quality. There was a plan to use the lfg system
to create the random numbers instead of using whatever the decoder
uses but for now this works fine. Entropy is far from important here.
Signed-off-by: Rostislav Pehlivanov
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da64bd6a992c5aa3b07d45412b34d26302e67c82
---
libavcodec/aaccoder.c | 52 +++--
tests/fate/aac.mak|2 +-
2 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c
index cf4b11b..dd2e62f 100644
--- a/libavcodec/aaccoder.c
+++ b/libavcodec/aaccoder.c
@@ -51,9 +51,12 @@
/** Frequency in Hz for lower limit of noise substitution **/
#define NOISE_LOW_LIMIT 4000
+/** Pointless to substitute very high short lived inaudiable frequencies **/
+#define NOISE_HIGH_LIMIT 18120
+
/* Parameter of f(x) = a*(lambda/100), defines the maximum fourier spread
* beyond which no PNS is used (since the SFBs contain tone rather than noise)
*/
-#define NOISE_SPREAD_THRESHOLD 0.9673f
+#define NOISE_SPREAD_THRESHOLD 0.5073f
/* Parameter of f(x) = a*(100/lambda), defines how much PNS is allowed to
* replace low energy non zero bands */
@@ -335,7 +338,7 @@ static void set_special_band_scalefactors(AACEncContext *s,
SingleChannelElement
minscaler_i = FFMIN(minscaler_i, sce->sf_idx[w*16+g]);
bands++;
} else if (sce->band_type[w*16+g] == NOISE_BT) {
-sce->sf_idx[w*16+g] =
av_clip(roundf(log2f(sce->pns_ener[w*16+g])*2), -100, 155);
+sce->sf_idx[w*16+g] =
av_clip(3+ceilf(log2f(sce->pns_ener[w*16+g])*2), -100, 155);
minscaler_n = FFMIN(minscaler_n, sce->sf_idx[w*16+g]);
bands++;
}
@@ -863,7 +866,7 @@ static void search_for_quantizers_fast(AVCodecContext
*avctx, AACEncContext *s,
static void search_for_pns(AACEncContext *s, AVCodecContext *avctx,
SingleChannelElement *sce)
{
FFPsyBand *band;
-int w, g, w2, i, start, count = 0;
+int w, g, w2, i;
float *PNS = &s->scoefs[0*128], *PNS34 = &s->scoefs[1*128];
float *NOR34 = &s->scoefs[3*128];
const float lambda = s->lambda;
@@ -871,20 +874,20 @@ static void search_for_pns(AACEncContext *s,
AVCodecContext *avctx, SingleChanne
const float thr_mult = NOISE_LAMBDA_REPLACE*(100.0f/lambda);
const float spread_threshold = NOISE_SPREAD_THRESHOLD*(lambda/100.f);
+if (sce->ics.window_sequence[0] == EIGHT_SHORT_SEQUENCE)
+return;
+
for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {
-start = 0;
for (g = 0; g < sce->ics.num_swb; g++) {
-int noise_sfi, try_pns = 0;
+int noise_sfi;
float dist1 = 0.0f, dist2 = 0.0f, noise_amp;
float pns_energy = 0.0f, energy_ratio, dist_thresh;
float sfb_energy = 0.0f, threshold = 0.0f, spread = 0.0f;
-float freq_boost = FFMAX(0.88f*start*freq_mult/NOISE_LOW_LIMIT,
1.0f);
-if (start*freq_mult < NOISE_LOW_LIMIT) {
-start += sce->ics.swb_sizes[g];
+const int start = sce->ics.swb_offset[w*16+g];
+const float freq = start*freq_mult;
+const float freq_boost = FFMAX(0.88f*freq/NOISE_LOW_LIMIT, 1.0f);
+if (freq < NOISE_LOW_LIMIT)
continue;
-} else {
-dist_thresh = FFMIN(0.008f*(NOISE_LOW_LIMIT/start*freq_mult),
1.11f);
-}
for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) {
band = &s->psy.ch[s->cur_channel].psy_bands[(w+w2)*16+g];
sfb_energy += band->energy;
@@ -892,18 +895,12 @@ static void search_for_pns(AACEncContext *s,
AVCodecContext *avctx, SingleChanne
threshold += band->threshold;
}
-if (sce->zeroes[w*16+g]) {
-try_pns = 1;
-} else if (sfb_energy < threshold*freq_boost) {
-try_pns = 1;
-} else if (spread > spread_threshold) {
-try_pns = 0;
-} else if (sfb_energy < threshold*thr_mult*freq_boost) {
-try_pns = 1;
-}
+/* Ramps down at ~8000Hz and loosens the dist threshold */
+dist_thresh = FFMIN(2.5f*NOISE_LOW_
[FFmpeg-cvslog] avfilter/vf_lut: use AV_OPT_TYPE_BOOL for negate_alpha option
ffmpeg | branch: master | Paul B Mahol | Wed Sep 9 08:56:51
2015 +| [af24763400692d72e8b0e227dc4979ebb6ddc13f] | committer: Paul B Mahol
avfilter/vf_lut: use AV_OPT_TYPE_BOOL for negate_alpha option
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af24763400692d72e8b0e227dc4979ebb6ddc13f
---
libavfilter/vf_lut.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c
index c81575a..7d708f6 100644
--- a/libavfilter/vf_lut.c
+++ b/libavfilter/vf_lut.c
@@ -503,7 +503,7 @@ DEFINE_LUT_FILTER(lutrgb, "Compute and apply a lookup table
to the RGB input vid
#if CONFIG_NEGATE_FILTER
static const AVOption negate_options[] = {
-{ "negate_alpha", NULL, OFFSET(negate_alpha), AV_OPT_TYPE_INT, { .i64 = 0
}, 0, 1, FLAGS },
+{ "negate_alpha", NULL, OFFSET(negate_alpha), AV_OPT_TYPE_BOOL, { .i64 = 0
}, 0, 1, FLAGS },
{ NULL }
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/huffyuvenc: use AV_OPT_TYPE_BOOL for non_deterministic option
ffmpeg | branch: master | Paul B Mahol | Wed Sep 9 09:46:28
2015 +| [6603368ab41d958647d3a71d44fb8417c6fafac4] | committer: Paul B Mahol
avcodec/huffyuvenc: use AV_OPT_TYPE_BOOL for non_deterministic option
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6603368ab41d958647d3a71d44fb8417c6fafac4
---
libavcodec/huffyuvenc.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c
index 40044a4..49d711a 100644
--- a/libavcodec/huffyuvenc.c
+++ b/libavcodec/huffyuvenc.c
@@ -1045,7 +1045,7 @@ static av_cold int encode_end(AVCodecContext *avctx)
static const AVOption options[] = {
{ "non_deterministic", "Allow multithreading for e.g. context=1 at the
expense of determinism",
- offsetof(HYuvContext, non_determ), AV_OPT_TYPE_INT, { .i64 = 1 },
+ offsetof(HYuvContext, non_determ), AV_OPT_TYPE_BOOL, { .i64 = 1 },
0, 1, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
{ NULL },
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/libmp3lame: use AV_OPT_TYPE_BOOL for all options
ffmpeg | branch: master | Paul B Mahol | Wed Sep 9 09:44:41
2015 +| [33a68759c135652e4da38704e1a5863c3d92305e] | committer: Paul B Mahol
avcodec/libmp3lame: use AV_OPT_TYPE_BOOL for all options
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33a68759c135652e4da38704e1a5863c3d92305e
---
libavcodec/libmp3lame.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c
index 05f7c5c..873b390 100644
--- a/libavcodec/libmp3lame.c
+++ b/libavcodec/libmp3lame.c
@@ -277,9 +277,9 @@ static int mp3lame_encode_frame(AVCodecContext *avctx,
AVPacket *avpkt,
#define OFFSET(x) offsetof(LAMEContext, x)
#define AE AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
-{ "reservoir","use bit reservoir", OFFSET(reservoir),
AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, AE },
-{ "joint_stereo", "use joint stereo", OFFSET(joint_stereo),
AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, AE },
-{ "abr", "use ABR", OFFSET(abr),
AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AE },
+{ "reservoir","use bit reservoir", OFFSET(reservoir),
AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, AE },
+{ "joint_stereo", "use joint stereo", OFFSET(joint_stereo),
AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, AE },
+{ "abr", "use ABR", OFFSET(abr),
AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, AE },
{ NULL },
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/wavpackenc: use AV_OPT_TYPE_BOOL for all options
ffmpeg | branch: master | Paul B Mahol | Wed Sep 9 09:49:24
2015 +| [8bf2d3e468821e542660b528fb8f89f616ee6e0b] | committer: Paul B Mahol
avcodec/wavpackenc: use AV_OPT_TYPE_BOOL for all options
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8bf2d3e468821e542660b528fb8f89f616ee6e0b
---
libavcodec/wavpackenc.c | 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/libavcodec/wavpackenc.c b/libavcodec/wavpackenc.c
index 6091e3f..977bcf0 100644
--- a/libavcodec/wavpackenc.c
+++ b/libavcodec/wavpackenc.c
@@ -1829,9 +1829,9 @@ static int wv_stereo(WavPackEncodeContext *s,
log_limit = (((s->flags & MAG_MASK) >> MAG_LSB) + 4) * 256;
log_limit = FFMIN(6912, log_limit);
-if (s->joint) {
-force_js = s->joint > 0;
-force_ts = s->joint < 0;
+if (s->joint != -1) {
+force_js = s->joint;
+force_ts = !s->joint;
}
if ((ret = allocate_buffers(s)) < 0)
@@ -2955,13 +2955,8 @@ static av_cold int wavpack_encode_close(AVCodecContext
*avctx)
#define OFFSET(x) offsetof(WavPackEncodeContext, x)
#define FLAGS AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_AUDIO_PARAM
static const AVOption options[] = {
-{ "joint_stereo", "", OFFSET(joint), AV_OPT_TYPE_INT, {.i64=0},-1, 1,
FLAGS, "joint" },
-{ "on", "mid/side", 0, AV_OPT_TYPE_CONST, {.i64= 1}, 0, 0, FLAGS,
"joint"},
-{ "off", "left/right", 0, AV_OPT_TYPE_CONST, {.i64=-1}, 0, 0, FLAGS,
"joint"},
-{ "auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64= 0}, 0, 0, FLAGS, "joint"},
-{ "optimize_mono","", OFFSET(optimize_mono), AV_OPT_TYPE_INT,
{.i64=0}, 0, 1, FLAGS, "opt_mono" },
-{ "on", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "opt_mono"},
-{ "off", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "opt_mono"},
+{ "joint_stereo", "", OFFSET(joint), AV_OPT_TYPE_BOOL, {.i64=-1}, -1, 1,
FLAGS },
+{ "optimize_mono", "", OFFSET(optimize_mono), AV_OPT_TYPE_BOOL, {.i64=0},
0, 1, FLAGS },
{ NULL },
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: add libsoxr to swresample's pkgconfig
ffmpeg | branch: master | Ricardo Constantino | Mon Sep 7
20:58:10 2015 +0100| [2641fe93767e812d0acb9e3cb9bf157e6e95] | committer:
Michael Niedermayer
configure: add libsoxr to swresample's pkgconfig
Fixes linking in FFMS and f265 at least, when ffmpeg is compiled with
libsoxr.
Signed-off-by: Ricardo Constantino
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2641fe93767e812d0acb9e3cb9bf157e6e95
---
configure |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index cd0c22a..056feea 100755
--- a/configure
+++ b/configure
@@ -5271,7 +5271,7 @@ enabled libshine && require_pkg_config shine
shine/layer3.h shine_encod
enabled libsmbclient && { use_pkg_config smbclient libsmbclient.h
smbc_init ||
require smbclient libsmbclient.h smbc_init
-lsmbclient; }
enabled libsnappy && require snappy snappy-c.h snappy_compress -lsnappy
-enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
+enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr &&
LIBSOXR="-lsoxr"
enabled libssh&& require_pkg_config libssh libssh/sftp.h sftp_init
enabled libspeex && require_pkg_config speex speex/speex.h
speex_decoder_init -lspeex
enabled libstagefright_h264 && require_cpp libstagefright_h264
"binder/ProcessState.h media/stagefright/MetaData.h
@@ -6273,4 +6273,4 @@ pkgconfig_generate libavfilter "FFmpeg audio/video
filtering library" "$LIBAVF
pkgconfig_generate libpostproc "FFmpeg postprocessing library"
"$LIBPOSTPROC_VERSION" ""
pkgconfig_generate libavresample "Libav audio resampling library"
"$LIBAVRESAMPLE_VERSION" "$LIBM"
pkgconfig_generate libswscale"FFmpeg image rescaling library"
"$LIBSWSCALE_VERSION""$LIBM"
-pkgconfig_generate libswresample "FFmpeg audio resampling library"
"$LIBSWRESAMPLE_VERSION" "$LIBM"
+pkgconfig_generate libswresample "FFmpeg audio resampling library"
"$LIBSWRESAMPLE_VERSION" "$LIBM $LIBSOXR"
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc: Fix compilation with --disable-everything --enable-parser= mpeg4video.
ffmpeg | branch: master | Hendrik Schreiber | Wed Sep 9 12:10:04 2015 +0200| [9d742d23d28c11749f90128aee0522270fd93a81] | committer: Carl Eugen Hoyos lavc: Fix compilation with --disable-everything --enable-parser=mpeg4video. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d742d23d28c11749f90128aee0522270fd93a81 --- libavcodec/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a23f0f0..d4ac7af 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -861,7 +861,7 @@ OBJS-$(CONFIG_MJPEG_PARSER)+= mjpeg_parser.o OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \ mpeg4videodec.o mpeg4video.o \ - ituh263dec.o h263dec.o + ituh263dec.o h263dec.o h263data.o OBJS-$(CONFIG_PNG_PARSER) += png_parser.o OBJS-$(CONFIG_MPEGAUDIO_PARSER)+= mpegaudio_parser.o \ mpegaudiodecheader.o mpegaudiodata.o ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc: Fix compilation with --disable-everything --enable-parser= mpeg4video.
ffmpeg | branch: release/2.8 | Hendrik Schreiber | Wed Sep 9 12:10:04 2015 +0200| [c3021738fc9041c693d7c9cf0649cb398b50da02] | committer: Carl Eugen Hoyos lavc: Fix compilation with --disable-everything --enable-parser=mpeg4video. (cherry picked from commit 9d742d23d28c11749f90128aee0522270fd93a81) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3021738fc9041c693d7c9cf0649cb398b50da02 --- libavcodec/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 407c6c3..5088304 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -861,7 +861,7 @@ OBJS-$(CONFIG_MJPEG_PARSER)+= mjpeg_parser.o OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \ mpeg4videodec.o mpeg4video.o \ - ituh263dec.o h263dec.o + ituh263dec.o h263dec.o h263data.o OBJS-$(CONFIG_PNG_PARSER) += png_parser.o OBJS-$(CONFIG_MPEGAUDIO_PARSER)+= mpegaudio_parser.o \ mpegaudiodecheader.o mpegaudiodata.o ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: add libsoxr to swresample's pkgconfig
ffmpeg | branch: release/2.8 | Ricardo Constantino | Mon
Sep 7 20:58:10 2015 +0100| [aa46ae8848ef871c093099bbee8b52ef73ea7b9c] |
committer: Timothy Gu
configure: add libsoxr to swresample's pkgconfig
Fixes linking in FFMS and f265 at least, when ffmpeg is compiled with
libsoxr.
Signed-off-by: Ricardo Constantino
Signed-off-by: Michael Niedermayer
(cherry picked from commit 2641fe93767e812d0acb9e3cb9bf157e6e95)
Signed-off-by: Timothy Gu
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa46ae8848ef871c093099bbee8b52ef73ea7b9c
---
configure |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 91f366e..fd39778 100755
--- a/configure
+++ b/configure
@@ -5261,7 +5261,7 @@ enabled libshine && require_pkg_config shine
shine/layer3.h shine_encod
enabled libsmbclient && { use_pkg_config smbclient libsmbclient.h
smbc_init ||
require smbclient libsmbclient.h smbc_init
-lsmbclient; }
enabled libsnappy && require snappy snappy-c.h snappy_compress -lsnappy
-enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
+enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr &&
LIBSOXR="-lsoxr"
enabled libssh&& require_pkg_config libssh libssh/sftp.h sftp_init
enabled libspeex && require_pkg_config speex speex/speex.h
speex_decoder_init -lspeex
enabled libstagefright_h264 && require_cpp libstagefright_h264
"binder/ProcessState.h media/stagefright/MetaData.h
@@ -6264,4 +6264,4 @@ pkgconfig_generate libavfilter "FFmpeg audio/video
filtering library" "$LIBAVF
pkgconfig_generate libpostproc "FFmpeg postprocessing library"
"$LIBPOSTPROC_VERSION" ""
pkgconfig_generate libavresample "Libav audio resampling library"
"$LIBAVRESAMPLE_VERSION" "$LIBM"
pkgconfig_generate libswscale"FFmpeg image rescaling library"
"$LIBSWSCALE_VERSION""$LIBM"
-pkgconfig_generate libswresample "FFmpeg audio resampling library"
"$LIBSWRESAMPLE_VERSION" "$LIBM"
+pkgconfig_generate libswresample "FFmpeg audio resampling library"
"$LIBSWRESAMPLE_VERSION" "$LIBM $LIBSOXR"
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Tag n2.9-dev : Main development, master branch after release/ 2.8 branched off
[ffmpeg] [branch: refs/tags/n2.9-dev] Tag:f34b4564b2c6acec09d9a2bbbc462d223c955843 > http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=f34b4564b2c6acec09d9a2bbbc462d223c955843 Tagger: James Almer Date: Wed Sep 9 16:51:58 2015 -0300 Main development, master branch after release/2.8 branched off ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/avformat: remove dead code
ffmpeg | branch: master | James Almer | Wed Sep 9 20:12:16
2015 -0300| [67d81b76b6e8571dae79c0a2a69e1bb1c24aa80b] | committer: James Almer
avformat/avformat: remove dead code
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67d81b76b6e8571dae79c0a2a69e1bb1c24aa80b
---
libavformat/avformat.h |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4068ab6..b7f18c1 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -478,12 +478,7 @@ typedef struct AVProbeData {
#define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fall back on
generic search */
#define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes
*/
#define AVFMT_ALLOW_FLUSH 0x1 /**< Format allows flushing. If not set,
the muxer will not receive a NULL packet in the write_packet function. */
-#if LIBAVFORMAT_VERSION_MAJOR <= 54
-#define AVFMT_TS_NONSTRICT 0x802 //we try to be compatible to the ABIs of
ffmpeg and major forks
-#else
-#define AVFMT_TS_NONSTRICT 0x2
-#endif
- /**< Format does not require strictly
+#define AVFMT_TS_NONSTRICT 0x2 /**< Format does not require strictly
increasing timestamps, but they must
still be monotonic */
#define AVFMT_TS_NEGATIVE 0x4 /**< Format allows muxing negative
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] RELEASE: update to 2.8.git
ffmpeg | branch: master | James Almer | Wed Sep 9 23:53:15 2015 -0300| [bbc8fcae1dd9f158d92d4b1687153bb0605cf2b3] | committer: James Almer RELEASE: update to 2.8.git Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bbc8fcae1dd9f158d92d4b1687153bb0605cf2b3 --- RELEASE |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE b/RELEASE index 19210d9..847967f 100644 --- a/RELEASE +++ b/RELEASE @@ -1 +1 @@ -2.7.git +2.8.git ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
