* qatar/master:
fate: Fix fate-ac3-fixed-encode for pre-ssse3 x86 machines
http: Pass the proper return code of net IO operations
http: Add 'post_data', a new option which sets custom HTTP post data
lavfi: amix: check active input count before calling request_samples
vp8: move block coeff arithcoder on stack.
mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3.
Conflicts:
libavformat/ac3dec.c
libavformat/mp3dec.c
tests/fate/ac3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
The old implementation, upon receiving a frame on the main
input, would request an overlay frame if necessary. This could
generate an infinite recursion, off-by-one frame mismatch and
other harmful effects, especially it the split filter is present
upgraph.
The new implementation uses the linear approach: it uses two
buffer queues for frames received out of turn and forwards
request_frame calls to the input where a frame is necessary.
* 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>
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>
* 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>
* qatar/master:
dwt: check malloc calls
ppc: Drop unused header regs.h
af_resample: remove an extra space in the log output
Convert vector_fmul range of functions to YASM and add AVX versions
lavfi: add an audio split filter
lavfi: rename vf_split.c to split.c
Conflicts:
doc/filters.texi
libavcodec/ppc/regs.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_split.c
libavfilter/split.c
libavfilter/version.h
libavfilter/vf_split.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Link properties have to be checked after config_props() is called to
make sure everything is sane, so the default config_props() for output
links was redundant.
Remove now empty defaults.c
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Nicolas George
Michael Niedermayer
Justin Ruggles
Janne Grunau
Paul B Mahol
Robert Nagy
Stefano Sabatini
Clément Bœsch
Anton Khirnov
Mina Nagy Zaki