[FFmpeg-cvslog] avcodec: fix vc1dsp dependencies
ffmpeg | branch: master | Xiaolei Yu | Sun Sep 25 18:56:55 2016 +0800| [5a70e56f2f116d675b7f97b4c4ad4b8db5771531] | committer: Carl Eugen Hoyos avcodec: fix vc1dsp dependencies > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a70e56f2f116d675b7f97b4c4ad4b8db5771531 --- libavcodec/aarch64/Makefile | 2 +- libavcodec/aarch64/h264cmc_neon.S | 2 +- libavcodec/arm/h264cmc_neon.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile index 36d9d34..c3df887 100644 --- a/libavcodec/aarch64/Makefile +++ b/libavcodec/aarch64/Makefile @@ -14,7 +14,7 @@ OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp_init.o # decoders/encoders OBJS-$(CONFIG_DCA_DECODER) += aarch64/synth_filter_init.o OBJS-$(CONFIG_RV40_DECODER) += aarch64/rv40dsp_init_aarch64.o -OBJS-$(CONFIG_VC1_DECODER) += aarch64/vc1dsp_init_aarch64.o +OBJS-$(CONFIG_VC1DSP) += aarch64/vc1dsp_init_aarch64.o OBJS-$(CONFIG_VORBIS_DECODER) += aarch64/vorbisdsp_init.o # ARMv8 optimizations diff --git a/libavcodec/aarch64/h264cmc_neon.S b/libavcodec/aarch64/h264cmc_neon.S index 486079f..ff97a29 100644 --- a/libavcodec/aarch64/h264cmc_neon.S +++ b/libavcodec/aarch64/h264cmc_neon.S @@ -445,7 +445,7 @@ endconst h264_chroma_mc4 avg, rv40 #endif -#if CONFIG_VC1_DECODER +#if CONFIG_VC1DSP h264_chroma_mc8 put, vc1 h264_chroma_mc8 avg, vc1 h264_chroma_mc4 put, vc1 diff --git a/libavcodec/arm/h264cmc_neon.S b/libavcodec/arm/h264cmc_neon.S index 77ed3c0..fc48a6f 100644 --- a/libavcodec/arm/h264cmc_neon.S +++ b/libavcodec/arm/h264cmc_neon.S @@ -455,7 +455,7 @@ endconst h264_chroma_mc4 avg, rv40 #endif -#if CONFIG_VC1_DECODER +#if CONFIG_VC1DSP h264_chroma_mc8 put, vc1 h264_chroma_mc8 avg, vc1 h264_chroma_mc4 put, vc1 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/avidec: Fix memleak with dv in avi
ffmpeg | branch: master | Michael Niedermayer | Sun
Sep 25 11:56:11 2016 +0200| [b98dafe04564d5fe3e5bf5073d871dd93a4a62de] |
committer: Michael Niedermayer
avformat/avidec: Fix memleak with dv in avi
Found-by: 连一汉
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b98dafe04564d5fe3e5bf5073d871dd93a4a62de
---
libavformat/avidec.c | 4
1 file changed, 4 insertions(+)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 858011c..26b0234 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -605,9 +605,13 @@ static int avi_read_header(AVFormatContext *s)
ast = s->streams[0]->priv_data;
av_freep(&s->streams[0]->codecpar->extradata);
av_freep(&s->streams[0]->codecpar);
+av_freep(&s->streams[0]->codec);
if (s->streams[0]->info)
av_freep(&s->streams[0]->info->duration_error);
av_freep(&s->streams[0]->info);
+if (s->streams[0]->internal)
+av_freep(&s->streams[0]->internal->avctx);
+av_freep(&s->streams[0]->internal);
av_freep(&s->streams[0]);
s->nb_streams = 0;
if (CONFIG_DV_DEMUXER) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ffmpeg: Fix bistream typos
ffmpeg | branch: master | Michael Niedermayer | Sun
Sep 25 03:29:07 2016 +0200| [9083e044f11b6f04cdc15d445872513b72d0e557] |
committer: Michael Niedermayer
ffmpeg: Fix bistream typos
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9083e044f11b6f04cdc15d445872513b72d0e557
---
ffmpeg.c | 2 +-
ffmpeg_opt.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 1b363f7..ec452d2 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2648,7 +2648,7 @@ static int init_output_bsfs(OutputStream *ost)
ret = av_bsf_init(ctx);
if (ret < 0) {
-av_log(NULL, AV_LOG_ERROR, "Error initializing bistream filter:
%s\n",
+av_log(NULL, AV_LOG_ERROR, "Error initializing bitstream filter:
%s\n",
ost->bsf_ctx[i]->filter->name);
return ret;
}
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 0dfdbd6..38b6b67 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1345,7 +1345,7 @@ static OutputStream *new_output_stream(OptionsContext *o,
AVFormatContext *oc, e
ret = av_bsf_alloc(filter, &ost->bsf_ctx[ost->nb_bitstream_filters]);
if (ret < 0) {
-av_log(NULL, AV_LOG_ERROR, "Error allocating a bistream filter
context\n");
+av_log(NULL, AV_LOG_ERROR, "Error allocating a bitstream filter
context\n");
exit_program(1);
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavd/sdl2: add sdl alias
ffmpeg | branch: master | Josh de Kock | Sun Sep 25 12:55:16
2016 +0100| [21344991c0d2a651d221dbdbb416031462a70d2c] | committer: Josh de Kock
lavd/sdl2: add sdl alias
This commit also adds an sdl alias for the configure script.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21344991c0d2a651d221dbdbb416031462a70d2c
---
configure | 2 ++
libavdevice/sdl2.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index f593191..899057d 100755
--- a/configure
+++ b/configure
@@ -1547,6 +1547,7 @@ EXTERNAL_LIBRARY_LIST="
opengl
openssl
schannel
+sdl
sdl2
securetransport
videotoolbox
@@ -5846,6 +5847,7 @@ if enabled gcrypt; then
fi
fi
+disabled sdl && disable sdl2
if ! disabled sdl2; then
SDL2_CONFIG="${cross_prefix}sdl2-config"
if check_pkg_config sdl2 SDL_events.h SDL_PollEvent; then
diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c
index 217ccc0..5d9e91e 100644
--- a/libavdevice/sdl2.c
+++ b/libavdevice/sdl2.c
@@ -352,7 +352,7 @@ static const AVClass sdl2_class = {
};
AVOutputFormat ff_sdl2_muxer = {
-.name = "sdl2",
+.name = "sdl,sdl2",
.long_name = NULL_IF_CONFIG_SMALL("SDL2 output device"),
.priv_data_size = sizeof(SDLContext),
.audio_codec= AV_CODEC_ID_NONE,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavd/sdl2: remove unused code
ffmpeg | branch: master | Josh de Kock | Sat Sep 24 18:57:55
2016 +0100| [fbb1fcd4d0b4613b500d01549f8ecd792f895002] | committer: Josh de Kock
lavd/sdl2: remove unused code
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbb1fcd4d0b4613b500d01549f8ecd792f895002
---
libavdevice/sdl2.c | 27 +--
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c
index e8252f0..217ccc0 100644
--- a/libavdevice/sdl2.c
+++ b/libavdevice/sdl2.c
@@ -48,10 +48,6 @@ typedef struct {
SDL_Rect texture_rect;
int inited;
-SDL_Thread *event_thread;
-SDL_mutex *mutex;
-SDL_cond *init_cond;
-int quit;
} SDLContext;
static const struct sdl_texture_format_entry {
@@ -140,20 +136,9 @@ static int sdl2_write_trailer(AVFormatContext *s)
{
SDLContext *sdl = s->priv_data;
-sdl->quit = 1;
-
if (sdl->texture)
SDL_DestroyTexture(sdl->texture);
sdl->texture = NULL;
-if (sdl->event_thread)
-SDL_WaitThread(sdl->event_thread, NULL);
-sdl->event_thread = NULL;
-if (sdl->mutex)
-SDL_DestroyMutex(sdl->mutex);
-sdl->mutex = NULL;
-if (sdl->init_cond)
-SDL_DestroyCond(sdl->init_cond);
-sdl->init_cond = NULL;
if (sdl->renderer)
SDL_DestroyRenderer(sdl->renderer);
@@ -204,7 +189,7 @@ static int sdl2_write_header(AVFormatContext *s)
if (!sdl->texture_fmt) {
av_log(s, AV_LOG_ERROR,
- "Unsupported pixel format '%s', choose one of yuv420p, yuyv422,
uyvy422, BGRA\n",
+ "Unsupported pixel format '%s'.\n",
av_get_pix_fmt_name(codecpar->format));
goto fail;
}
@@ -255,7 +240,7 @@ fail:
static int sdl2_write_packet(AVFormatContext *s, AVPacket *pkt)
{
-int ret = 0;
+int ret, quit = 0;
SDLContext *sdl = s->priv_data;
AVCodecParameters *codecpar = s->streams[0]->codecpar;
uint8_t *data[4];
@@ -268,14 +253,14 @@ static int sdl2_write_packet(AVFormatContext *s, AVPacket
*pkt)
switch (event.key.keysym.sym) {
case SDLK_ESCAPE:
case SDLK_q:
-sdl->quit = 1;
+quit = 1;
break;
default:
break;
}
break;
case SDL_QUIT:
-sdl->quit = 1;
+quit = 1;
break;
case SDL_WINDOWEVENT:
switch(event.window.event){
@@ -294,13 +279,12 @@ static int sdl2_write_packet(AVFormatContext *s, AVPacket
*pkt)
}
}
-if (sdl->quit) {
+if (quit) {
sdl2_write_trailer(s);
return AVERROR(EIO);
}
av_image_fill_arrays(data, linesize, pkt->data, codecpar->format,
codecpar->width, codecpar->height, 1);
-SDL_LockMutex(sdl->mutex);
switch (sdl->texture_fmt) {
/* case SDL_PIXELFORMAT_ARGB:
* case SDL_PIXELFORMAT_RGBA:
@@ -346,7 +330,6 @@ static int sdl2_write_packet(AVFormatContext *s, AVPacket
*pkt)
SDL_RenderClear(sdl->renderer);
SDL_RenderCopy(sdl->renderer, sdl->texture, NULL, &sdl->texture_rect);
SDL_RenderPresent(sdl->renderer);
-SDL_UnlockMutex(sdl->mutex);
return ret;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avconv: do not set encoder options when streamcopy is used
ffmpeg | branch: master | Anton Khirnov | Mon May 23
09:29:01 2016 +0200| [1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3] | committer:
Anton Khirnov
avconv: do not set encoder options when streamcopy is used
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3
---
avconv.c | 4
1 file changed, 4 deletions(-)
diff --git a/avconv.c b/avconv.c
index 6470837..d7365f3 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1735,10 +1735,6 @@ static int init_output_stream(OutputStream *ost, char
*error, int error_len)
ost->st->time_base = ost->enc_ctx->time_base;
} else if (ost->stream_copy) {
-ret = av_opt_set_dict(ost->enc_ctx, &ost->encoder_opts);
-if (ret < 0)
-return ret;
-
/*
* FIXME: will the codec context used by the parser during streamcopy
* This should go away with the new parser API.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3'
ffmpeg | branch: master | Clément Bœsch | Sun Sep 25 19:15:44 2016 +0200| [99dfa55d5a5a4f8a2fb9dcda9c0283f90db68de9] | committer: Clément Bœsch Merge commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3' * commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3': avconv: do not set encoder options when streamcopy is used This chunk was removed in 955b818cf947473ec94a3fe8aa7f408b119fbbc9 already. Merged-by: Clément Bœsch > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99dfa55d5a5a4f8a2fb9dcda9c0283f90db68de9 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc: remove codecpar mention in libav-merge.txt
ffmpeg | branch: master | Clément Bœsch | Sun Sep 25 19:17:39 2016 +0200| [485f75b2786a8e6173e01345feea58b44aea2244] | committer: Clément Bœsch doc: remove codecpar mention in libav-merge.txt > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=485f75b2786a8e6173e01345feea58b44aea2244 --- doc/libav-merge.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 4b2bb76..2011ae5 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -111,4 +111,3 @@ TODO/FIXME/UNMERGED === - HEVC DSP and x86 MC SIMD improvements from Libav (see http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/204917) -- Porting ffmpeg*.c to codecpar (see bbf5ef9dac9475d8ed22da23acc2eb63a2640784) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc: move out merge script to tools
ffmpeg | branch: master | Clément Bœsch | Sun Sep 25 19:26:39 2016 +0200| [95a7cbb09de1d63ed050371a34794b3fed49b2dc] | committer: Clément Bœsch doc: move out merge script to tools > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95a7cbb09de1d63ed050371a34794b3fed49b2dc --- doc/libav-merge.txt | 36 +--- tools/libav-merge-next-commit | 22 ++ 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 2011ae5..4fd863e 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -71,37 +71,11 @@ a different merge conflict style: $ git config --global merge.conflictstyle diff3 -Here is a script to help merging the next commit in the queue: - -#!/bin/sh - -if [ "$1" != "merge" -a "$1" != "noop" ]; then - printf "Usage: $0 \n" - exit 0 -fi - -[ "$1" = "noop" ] && merge_opts="-s ours" - -nextrev=$(git rev-list libav/master --not master --no-merges | tail -n1) -if [ -z "$nextrev" ]; then -printf "Nothing to merge..\n" -exit 0 -fi -printf "Merging $(git log -n 1 --oneline $nextrev)\n" -git merge --no-commit $merge_opts --no-ff --log $nextrev - -if [ "$1" = "noop" -a -n "$2" ]; then - printf "\nThis commit is a noop, see $2\n" >> .git/MERGE_MSG -fi - -printf "\nMerged-by: $(git config --get user.name) <$(git config --get user.email)>\n" >> .git/MERGE_MSG - - -The script assumes a remote named libav. - -It has two modes: merge, and noop. The noop mode creates a merge with no change -to the HEAD. You can pass a hash as extra argument to reference a justification -(it is common that we already have the change done in FFmpeg). +tools/libav-merge-next-commit is a script to help merging the next commit in +the queue. It assumes a remote named libav. It has two modes: merge, and noop. +The noop mode creates a merge with no change to the HEAD. You can pass a hash +as extra argument to reference a justification (it is common that we already +have the change done in FFmpeg). Also see tools/murge, you can copy and paste a 3 way conflict into its stdin and it will display colored diffs. Any arguments to murge (like ones to suppress diff --git a/tools/libav-merge-next-commit b/tools/libav-merge-next-commit new file mode 100755 index 000..9bd03fa --- /dev/null +++ b/tools/libav-merge-next-commit @@ -0,0 +1,22 @@ +#!/bin/sh + +if [ "$1" != "merge" -a "$1" != "noop" ]; then +printf "Usage: $0 \n" +exit 0 +fi + +[ "$1" = "noop" ] && merge_opts="-s ours" + +nextrev=$(git rev-list libav/master --not master --no-merges | tail -n1) +if [ -z "$nextrev" ]; then +printf "Nothing to merge..\n" +exit 0 +fi +printf "Merging $(git log -n 1 --oneline $nextrev)\n" +git merge --no-commit $merge_opts --no-ff --log $nextrev + +if [ "$1" = "noop" -a -n "$2" ]; then +printf "\nThis commit is a noop, see $2\n" >> .git/MERGE_MSG +fi + +printf "\nMerged-by: $(git config --get user.name) <$(git config --get user.email)>\n" >> .git/MERGE_MSG ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/libav-merge: change gmane link to a ffmpeg.org one
ffmpeg | branch: master | Clément Bœsch | Sun Sep 25 19:38:27 2016 +0200| [bd9e4254595efab0aa07ed451a23f492d9ad4e5b] | committer: Clément Bœsch doc/libav-merge: change gmane link to a ffmpeg.org one > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd9e4254595efab0aa07ed451a23f492d9ad4e5b --- doc/libav-merge.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 4fd863e..d7936f9 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -84,4 +84,4 @@ whitespace differences) are passed into colordiff. TODO/FIXME/UNMERGED === -- HEVC DSP and x86 MC SIMD improvements from Libav (see http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/204917) +- HEVC DSP and x86 MC SIMD improvements from Libav (see https://ffmpeg.org/pipermail/ffmpeg-devel/2015-December/184777.html) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/avidec: remove warning about deprecated declarations
ffmpeg | branch: master | James Almer | Sun Sep 25 16:03:21 2016 -0300| [aa0dc698dba8ebf1e005ff0f948fe7783cd73364] | committer: James Almer avformat/avidec: remove warning about deprecated declarations Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa0dc698dba8ebf1e005ff0f948fe7783cd73364 --- libavformat/avidec.c | 4 1 file changed, 4 insertions(+) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 26b0234..1e8481e 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -605,7 +605,11 @@ static int avi_read_header(AVFormatContext *s) ast = s->streams[0]->priv_data; av_freep(&s->streams[0]->codecpar->extradata); av_freep(&s->streams[0]->codecpar); +#if FF_API_LAVF_AVCTX +FF_DISABLE_DEPRECATION_WARNINGS av_freep(&s->streams[0]->codec); +FF_ENABLE_DEPRECATION_WARNINGS +#endif if (s->streams[0]->info) av_freep(&s->streams[0]->info->duration_error); av_freep(&s->streams[0]->info); ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/Makefile: Fix mlpenc dependencies
ffmpeg | branch: master | James Almer | Sun Sep 25 16:12:18 2016 -0300| [e3842e87f2f03f8e2053cd4f5b7354e0274c2110] | committer: James Almer avcodec/Makefile: Fix mlpenc dependencies Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3842e87f2f03f8e2053cd4f5b7354e0274c2110 --- libavcodec/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 276308b..a0413ff 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -383,7 +383,7 @@ OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpegenc_common.o OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o OBJS-$(CONFIG_MJPEG_VAAPI_ENCODER) += vaapi_encode_mjpeg.o OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o -OBJS-$(CONFIG_MLP_ENCODER) += mlpenc.o +OBJS-$(CONFIG_MLP_ENCODER) += mlpenc.o mlp.o OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o OBJS-$(CONFIG_MOTIONPIXELS_DECODER)+= motionpixels.o OBJS-$(CONFIG_MOVTEXT_DECODER) += movtextdec.o ass.o ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ffmpeg: fix memleak of bitstream filter context on failure
ffmpeg | branch: master | James Almer | Sat Sep 24 15:03:42
2016 -0300| [449dc25f56fa1a84285e0f972849c4c40896807b] | committer: James Almer
ffmpeg: fix memleak of bitstream filter context on failure
Increase the nb_bitstream_filters value as soon as the context is allocated, so
if option parsing fails the last context is actually freed.
Reviewed-by: Josh de Kock
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=449dc25f56fa1a84285e0f972849c4c40896807b
---
ffmpeg_opt.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 38b6b67..73da546 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1349,14 +1349,16 @@ static OutputStream *new_output_stream(OptionsContext
*o, AVFormatContext *oc, e
exit_program(1);
}
+ost->nb_bitstream_filters++;
+
if (bsf_options_str && filter->priv_class) {
-const AVOption *opt =
av_opt_next(ost->bsf_ctx[ost->nb_bitstream_filters]->priv_data, NULL);
+const AVOption *opt =
av_opt_next(ost->bsf_ctx[ost->nb_bitstream_filters-1]->priv_data, NULL);
const char * shorthand[2] = {NULL};
if (opt)
shorthand[0] = opt->name;
-ret =
av_opt_set_from_string(ost->bsf_ctx[ost->nb_bitstream_filters]->priv_data,
bsf_options_str, shorthand, "=", ":");
+ret =
av_opt_set_from_string(ost->bsf_ctx[ost->nb_bitstream_filters-1]->priv_data,
bsf_options_str, shorthand, "=", ":");
if (ret < 0) {
av_log(NULL, AV_LOG_ERROR, "Error parsing options for
bitstream filter %s\n", bsf_name);
exit_program(1);
@@ -1364,8 +1366,6 @@ static OutputStream *new_output_stream(OptionsContext *o,
AVFormatContext *oc, e
}
av_freep(&bsf);
-ost->nb_bitstream_filters++;
-
if (*bsfs)
bsfs++;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ffmpeg: fix memleak of encoder options AVDictionary on failure
ffmpeg | branch: master | James Almer | Sat Sep 24 14:59:01 2016 -0300| [3ac76d76185114bdfade3156a72ff97a65488adf] | committer: James Almer ffmpeg: fix memleak of encoder options AVDictionary on failure Reviewed-by: Josh de Kock Signed-off-by: James Almer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ac76d76185114bdfade3156a72ff97a65488adf --- ffmpeg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ffmpeg.c b/ffmpeg.c index ec452d2..df55a49 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -513,6 +513,7 @@ static void ffmpeg_cleanup(int ret) av_frame_free(&ost->filtered_frame); av_frame_free(&ost->last_frame); +av_dict_free(&ost->encoder_opts); av_parser_close(ost->parser); ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/hevc: Add YUV420P10 to vaapi hardware decode - permits hardware decoding of HEVC Main 10 on AMD RX 480
ffmpeg | branch: master | Jean-Yves Simon | Tue Aug 9 17:15:30 2016 +0200| [fb37da37ac1e17f643269ea5bad5bee7e79dcb3a] | committer: Michael Niedermayer avcodec/hevc: Add YUV420P10 to vaapi hardware decode - permits hardware decoding of HEVC Main 10 on AMD RX 480 Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb37da37ac1e17f643269ea5bad5bee7e79dcb3a --- libavcodec/hevc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index cb1263c..764e093 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -370,6 +370,9 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fm #if CONFIG_HEVC_D3D11VA_HWACCEL *fmt++ = AV_PIX_FMT_D3D11VA_VLD; #endif +#if CONFIG_HEVC_VAAPI_HWACCEL +*fmt++ = AV_PIX_FMT_VAAPI; +#endif break; } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavf/movenc: Allow to disable writing the timecode track.
ffmpeg | branch: master | Carl Eugen Hoyos | Mon Sep 26
08:50:48 2016 +0200| [46aae846165c35e6d184087542dd3e610fa36506] | committer:
Carl Eugen Hoyos
lavf/movenc: Allow to disable writing the timecode track.
Fixes ticket #5492.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46aae846165c35e6d184087542dd3e610fa36506
---
doc/muxers.texi | 3 +++
libavformat/movenc.c | 6 --
libavformat/movenc.h | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/doc/muxers.texi b/doc/muxers.texi
index 27eb9a0..c8a056f 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -884,6 +884,9 @@ the new default-base-is-moof flag instead. This flag is new
from
14496-12:2012. This may make the fragments easier to parse in certain
circumstances (avoiding basing track fragment location calculations
on the implicit end of the previous track fragment).
+@item -write_tmcd
+Specify @code{on} to force writing a timecode track, @code{off} to disable it
+and @code{auto} to write a timecode track only for mov and mp4 output
(default).
@end table
@subsection Example
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 0382309..449d0b5 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -90,6 +90,7 @@ static const AVOption options[] = {
{ "encryption_key", "The media encryption key (hex)",
offsetof(MOVMuxContext, encryption_key), AV_OPT_TYPE_BINARY, .flags =
AV_OPT_FLAG_ENCODING_PARAM },
{ "encryption_kid", "The media encryption key identifier (hex)",
offsetof(MOVMuxContext, encryption_kid), AV_OPT_TYPE_BINARY, .flags =
AV_OPT_FLAG_ENCODING_PARAM },
{ "use_stream_ids_as_track_ids", "use stream ids as track ids",
offsetof(MOVMuxContext, use_stream_ids_as_track_ids), AV_OPT_TYPE_BOOL, {.i64 =
0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM},
+{ "write_tmcd", "force or disable writing tmcd", offsetof(MOVMuxContext,
write_tmcd), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM},
{ NULL },
};
@@ -2312,7 +2313,7 @@ static int mov_write_minf_tag(AVFormatContext *s,
AVIOContext *pb, MOVMuxContext
} else if (track->tag == MKTAG('r','t','p',' ')) {
mov_write_hmhd_tag(pb);
} else if (track->tag == MKTAG('t','m','c','d')) {
-if (track->mode == MODE_MP4)
+if (track->mode != MODE_MOV)
mov_write_nmhd_tag(pb);
else
mov_write_gmhd_tag(pb, track);
@@ -5539,7 +5540,8 @@ static int mov_write_header(AVFormatContext *s)
}
}
-if (mov->mode == MODE_MOV || mov->mode == MODE_MP4) {
+if ( mov->write_tmcd == -1 && (mov->mode == MODE_MOV || mov->mode ==
MODE_MP4)
+|| mov->write_tmcd == 1) {
tmcd_track = mov->nb_streams;
/* +1 tmcd track for each video stream with a timecode */
diff --git a/libavformat/movenc.h b/libavformat/movenc.h
index ea76e39..1f7a9d7 100644
--- a/libavformat/movenc.h
+++ b/libavformat/movenc.h
@@ -219,6 +219,7 @@ typedef struct MOVMuxContext {
int use_stream_ids_as_track_ids;
int track_ids_ok;
+int write_tmcd;
} MOVMuxContext;
#define FF_MOV_FLAG_RTP_HINT (1 << 0)
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
