* qatar/master:
rtmp: Return a proper error code instead of -1
rtmp: Check malloc calls
rtmp: Check ff_rtmp_packet_create calls
lavfi: add audio mix filter
flvdec: Make sure sample_rate is set to the updated value
tqi: Pass errors from the MB decoder
Conflicts:
Changelog
doc/filters.texi
libavcodec/eatqi.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Switching to visualization instead of exiting ffplay is a bit more tricky, so
just exit for now.
Fixes ticket 38.
Signed-off-by: Marton Balint <cus@passwd.hu>
We do this to ensure that input_get_buffer is not called from a
frame_worker_thread of a multithreaded decoder when we already freed the
filters.
Fixes occasional segfaults on video stream change.
Signed-off-by: Marton Balint <cus@passwd.hu>
This fixes occasional segfaults caused by lock request of the packet queue from
the reader thread.
Also don't allow to put frames into the queue when it's aborted, and don't try
to fill the queue with frames when it is aborted.
Signed-off-by: Marton Balint <cus@passwd.hu>
This lists git history, which is better kept in the history itself
that is both ours as this file as well as the actual history of the
ffmpeg-mt project.
If someone thinks this is not ok, drop me a mail and ill put it back!
Also note this file was not carried in our previous release with noone
complaining
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
git blame:
77 Stefano Sabatini
1 Michael Niedermayer
Initial commit:
commit 2f83681c79
Author: Stefano Sabatini <stefasab@gmail.com>
Date: Sat Mar 10 14:01:28 2012 +0100
lavfi: port libmpcodecs remove-logo filter
The code is based on the remove-logo filter in MPlayer/libmpcodecs, by
Robert Edele, relicensed to LGPL with consent of the author.
Address trac issue #249.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
git blame:
132 Stefano Sabatini
77 Vitor Sessak
49 Michael Niedermayer
24 Anton Khirnov
22 S.N. Hemanth Meenakshisundaram
13 Bobby Bingham
7 Luca Barbato
2 Nicolas George
2 Alex Converse
1 Diego Elio Pettenò
Initial commit not traced as this file was split out.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Only commit:
commit 54c5dd89e3
Author: Anton Khirnov <anton@khirnov.net>
Date: Wed May 9 14:08:21 2012 +0200
lavfi: Add fps filter.
Partially based on a patch by Robert Nagy <ronag89@gmail.com>
also see [FFmpeg-devel] [PATCH 07/10] vf_fps: fix copyright
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
git blame:
75 Anton Khirnov
72 Michael Niedermayer
39 Stefano Sabatini
23 S.N. Hemanth Meenakshisundaram
9 Vitor Sessak
6 Robert Nagy
2 Diego Biurrun
1 Andrey Utkin
Note:
commit ab165047a6
Author: Anton Khirnov <anton@khirnov.net>
Date: Fri Apr 27 17:27:40 2012 +0200
lavfi: add a function for copying properties from AVFilterBufferRef->AVFrame
Based on a commit by Stefano Sabatini <stefano.sabatini-lala@poste.it>
commit 4a1ac8c43f
Author: Anton Khirnov <anton@khirnov.net>
Date: Thu May 10 07:58:11 2012 +0200
lavfi: move buffer management function to a separate file.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
git blame:
45 Stefano Sabatini
23 Clément Bœsch
4 Michael Niedermayer
3 Robert Nagy
3 Nicolas George
2 Roger Pau Monné
Initial commit:
commit 566666caf3
Author: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sun May 1 14:47:05 2011 +0200
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Move AVPALETTE_SIZE and AVPALETTE_COUNT definition from
libavcodec/avcodec.h to libavutil/pixfmt.h.
The definition is more useful in libavutil, where it can be shared for
example by libavfilter and libswscale.
* qatar/master:
os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2
http: Add support for reading http POST reply headers
http: Add http_shutdown() for ending writing of posts
tcp: Allow signalling end of reading/writing
avio: Add a function for signalling end of reading/writing
lavfi: fix comment, audio is supported now.
lavfi: fix incorrect comment.
lavfi: remove avfilter_null_* from public API on next bump.
lavfi: remove avfilter_default_* from public API on next bump.
lavfi: deprecate default config_props() callback and refactor avfilter_config_links()
avfiltergraph: smarter sample format selection.
avconv: rename transcode_audio/video to decode_audio/video.
asyncts: reset delta to 0 when it's not used.
x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.
dwt: return errors from ff_slice_buffer_init()
Conflicts:
ffmpeg.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/formats.c
libavfilter/version.h
libavfilter/vf_blackframe.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_format.c
libavfilter/vf_showinfo.c
libavfilter/video.c
libavfilter/video.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
The sample_rate variable is used for checks for audio format
changes at the end of the function.
This fixes cases where the sample rate was set from the codec
id by flv_set_audio_codec (as for nellymoser 8 kHz/16 kHz),
so the value set to last_sample_rate wasn't equal to sample_rate
at this point. This caused the demuxer otherwise reports a spurious
change to 5512 Hz and back to the correct one.
Updating channels in the same way is only done for consistency.
Currently, flv_set_audio_codec doesn't update that value.
Signed-off-by: Martin Storsjö <martin@martin.st>
This silences some valgrind warnings.
CC: libav-stable@libav.org
Fixes second half of http://ffmpeg.org/trac/ffmpeg/ticket/794
Bug found by: Oana Stratulat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit f85334f58e)
Stefano Sabatini
Clément Bœsch
Michael Bradshaw
Michael Niedermayer
Marton Balint
Samuel Pitoiset
Kyle
Carl Eugen Hoyos
Justin Ruggles
Martin Storsjö