]>
git.sesse.net Git - ffmpeg/log
Clément Bœsch [Sun, 13 May 2012 09:38:19 +0000 (11:38 +0200)]
lavu/bprint: add av_bprint_reset().
Nicolas George [Wed, 9 May 2012 18:27:00 +0000 (20:27 +0200)]
lavfi: document filter design subtleties.
The details on reference ownership and permissions are missing.
Michael Niedermayer [Mon, 14 May 2012 15:51:05 +0000 (17:51 +0200)]
update_initial_durations: use av_ts2str()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 May 2012 15:14:44 +0000 (17:14 +0200)]
update_initial_durations: add some checks to ensure things match up.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 May 2012 13:15:11 +0000 (15:15 +0200)]
ffmpeg: revert 492cc1
This restores correct block_align values in case of stream copy.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 May 2012 12:07:09 +0000 (14:07 +0200)]
ogg: rewrite first timestamp reading code.
this is simpler and closer to how timestamps are found for seeking.
Fixes Ticket1186
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 May 2012 12:03:07 +0000 (14:03 +0200)]
ogg: in ogg_get_length() start from data_offset not 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 12 May 2012 20:42:06 +0000 (22:42 +0200)]
doc/ffprobe: fix rendering of the timecode chapter in the man page
Stefano Sabatini [Wed, 9 May 2012 23:28:07 +0000 (01:28 +0200)]
ffprobe: add "nokey" option to default writer
Help simplifying parsing in certain cases.
Stefano Sabatini [Tue, 8 May 2012 23:20:21 +0000 (01:20 +0200)]
ffprobe: add "noprint_wrappers" option to default writer
The option is useful for simplifying parsing.
Also use the new option in fate, in order to fix the regression
introduced by the previous commit.
Stefano Sabatini [Tue, 8 May 2012 22:43:58 +0000 (00:43 +0200)]
ffprobe: simplify/fix logic for the -show_format_entry option
Do not skip chapter header/footer printing, which breaks the parsing for
most writers.
Stefano Sabatini [Tue, 8 May 2012 23:28:58 +0000 (01:28 +0200)]
ffprobe: remove unused print_format_entry() function
The function was introduced in
653d117c , but is not required.
Michael Niedermayer [Mon, 14 May 2012 09:26:44 +0000 (11:26 +0200)]
mpegvideo_enc: Fix chroma edge size
Fixes ticket1303
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 May 2012 00:38:13 +0000 (02:38 +0200)]
mpegts: fix handling of files smaller than 8kb
Fixes Ticket1094
Analyzed-by: mjs973
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 23:50:55 +0000 (01:50 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: fix link to fate.libav.org
Conflicts:
doc/fate.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 23:36:40 +0000 (01:36 +0200)]
flac_parser: speedup fifo realloc
Fixes Ticket1121
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 13 May 2012 20:22:35 +0000 (22:22 +0200)]
lavf/utils: make use of av_ts2str() to print timestamps.
Michael Niedermayer [Sun, 13 May 2012 18:56:18 +0000 (20:56 +0200)]
libswresample-simd: Add ff_pack_6ch_float_to_int32_a_avx and ff_pack_6ch_float_to_int32_a_sse4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 18:53:30 +0000 (20:53 +0200)]
libswresample-simd: add ff_pack_6ch_int32_to_float_a_avx and ff_pack_6ch_int32_to_float_a_sse4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 18:45:32 +0000 (20:45 +0200)]
libswresample: make NOP_N macro less picky on its parameters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 18:44:08 +0000 (20:44 +0200)]
libswresample: Change FLOAT_TO_INT32_N to need 1 register less
same speed on sandy bridge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 18:31:12 +0000 (20:31 +0200)]
libswresample-simd: rename 6ch pack to what it is
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 18:30:13 +0000 (20:30 +0200)]
libswresample-simd: make the converter registers parameters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 17:24:34 +0000 (19:24 +0200)]
libswresample: cosmetics
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 17:20:47 +0000 (19:20 +0200)]
libswresample: unaligned AVX/SSE4 float and int32 6ch pack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Sun, 13 May 2012 17:09:01 +0000 (19:09 +0200)]
libswresample: Implement MMX, SSE4 and AVX 6ch float and int32 packing function.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Sun, 13 May 2012 01:31:52 +0000 (03:31 +0200)]
wmvenc: check if width is multiple of 2
The width of wmv1/2 video must be multiple of 2 or win32 codec will fail to decode it (WMP displays black screen).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 9 May 2012 20:39:40 +0000 (22:39 +0200)]
lavf/mp3enc: support MPEG-2 and MPEG-2.5 sample rates when writing Xing header.
Carl Eugen Hoyos [Sun, 13 May 2012 14:45:31 +0000 (16:45 +0200)]
Set bits_per_raw_sample when decoding libopenjpeg images.
Reviewed-by: Michael Bradshaw
Michael Niedermayer [Sun, 13 May 2012 09:15:36 +0000 (11:15 +0200)]
mpeg1enc: dont use size extension.
the spec doesnt mention this extension for mpeg1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 09:13:03 +0000 (11:13 +0200)]
mpeg2dec: support slice_vertical_position_extension
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 09:12:20 +0000 (11:12 +0200)]
mpeg2enc: check input dimensions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 09:11:56 +0000 (11:11 +0200)]
mpeg1enc: check input dimensions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 May 2012 07:59:12 +0000 (09:59 +0200)]
h263enc: test that dimensions are a multiple of 4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Elio Pettenò [Sat, 12 May 2012 23:22:06 +0000 (16:22 -0700)]
doc: fix link to fate.libav.org
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sat, 12 May 2012 22:13:49 +0000 (00:13 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: autoinsert resample filter when necessary.
lavfi: add lavr-based audio resampling filter.
x86: vc1: drop MMX loop filter implementation, which uses MMX2 instructions.
Conflicts:
configure
doc/filters.texi
libavcodec/x86/vc1dsp_mmx.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/avfiltergraph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 May 2012 21:46:43 +0000 (23:46 +0200)]
avfilter: fix regression since addition of extended_data to audio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 May 2012 19:09:32 +0000 (21:09 +0200)]
ffmpeg: preserve bits_per_coded sample on stream copy.
Fixes Ticket1124
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 9 May 2012 21:45:16 +0000 (23:45 +0200)]
doc/examples: add libswresample in the libraries.
It is required for audio filtering.
Clément Bœsch [Wed, 9 May 2012 21:47:08 +0000 (23:47 +0200)]
doc/examples: use buffersrc.h instead of deprecated asrc_abuffer.h.
Clément Bœsch [Wed, 9 May 2012 21:59:40 +0000 (23:59 +0200)]
doc/examples: add programs to .gitignore.
Michael Niedermayer [Sat, 12 May 2012 16:47:42 +0000 (18:47 +0200)]
h263enc: check w/h for validity
Fixes Ticket1063
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Fri, 4 May 2012 13:35:12 +0000 (15:35 +0200)]
lavfi: autoinsert resample filter when necessary.
Anton Khirnov [Fri, 4 May 2012 13:09:17 +0000 (15:09 +0200)]
lavfi: add lavr-based audio resampling filter.
Clément Bœsch [Sat, 12 May 2012 16:08:26 +0000 (18:08 +0200)]
doc/examples: fix typo.
Clément Bœsch [Wed, 9 May 2012 21:08:17 +0000 (23:08 +0200)]
doc/examples: add -O2 in CFLAGS.
Clément Bœsch [Sat, 12 May 2012 15:24:08 +0000 (17:24 +0200)]
doc/examples: add missing math.h include in decoding/encoding example.
The header is required for the sin() function.
Clément Bœsch [Wed, 9 May 2012 21:06:43 +0000 (23:06 +0200)]
doc/examples: link decoding_encoding and muxing with math lib.
These two examples use the sin() function.
Clément Bœsch [Wed, 9 May 2012 21:05:12 +0000 (23:05 +0200)]
doc/examples: rename LDFLAGS to LDLIBS.
Clément Bœsch [Sat, 12 May 2012 15:58:14 +0000 (17:58 +0200)]
lavfi: remove audio.h include from avfilter.h.
avfilter.h is a public header and the unexported audio.h header contains
only internal prototypes.
Michael Kostylev [Fri, 11 May 2012 10:26:44 +0000 (12:26 +0200)]
x86: vc1: drop MMX loop filter implementation, which uses MMX2 instructions.
Carl Eugen Hoyos [Sat, 12 May 2012 11:11:56 +0000 (13:11 +0200)]
Fix flashsv2 encoder error message.
Michael Niedermayer [Sat, 12 May 2012 10:03:47 +0000 (12:03 +0200)]
flashsv2enc: fix division by zero
Fixes other half of Ticket1105
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 May 2012 10:03:23 +0000 (12:03 +0200)]
flashsvenc: fix image sizes below 192x192
Fixes half of Ticket1105
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 May 2012 08:57:15 +0000 (10:57 +0200)]
tiffenc: fix out of array read
Fixes ticket1112
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 May 2012 01:35:19 +0000 (03:35 +0200)]
snow: fix 32x32 encoding
Fixes ticket1083
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 May 2012 18:43:41 +0000 (20:43 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: employ better names and add a convenient shorthand for vp6 tests
arm/neon: dsputil: use correct size specifiers on vld1/vst1
arm: dsputil: prettify some conditional instructions in put_pixels macros
vqavideo: change x/y loop counters to the usual pattern
avconv: use lrint() for rounding double timestamps
Conflicts:
tests/ref/fate/vc1-ism
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 May 2012 16:37:41 +0000 (18:37 +0200)]
mpeg12: fix logic that prevents extradata from being parsed twice.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 May 2012 16:37:03 +0000 (18:37 +0200)]
mpeg12: print an error when there was a frame in extradata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 11 May 2012 15:50:28 +0000 (17:50 +0200)]
Allow decoding of j2k images with bpp<8 and 8<bpp<16 with libopenjpeg.
Fixes one of several problems described in ticket #1279.
Michael Niedermayer [Fri, 11 May 2012 14:53:22 +0000 (16:53 +0200)]
lavf: extend the avi raw hack to mov
Fixes ticket1194
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 May 2012 14:52:47 +0000 (16:52 +0200)]
lavf: print a matching tag in case of code tag validation failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 May 2012 13:04:38 +0000 (15:04 +0200)]
lavfutils: ff_load_image: Initialize context
should fix ticket1264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 May 2012 12:04:33 +0000 (14:04 +0200)]
mpegtsenc: fix 10l typo, wrong stream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 May 2012 11:41:06 +0000 (13:41 +0200)]
mpegtsenc: check max_delay in write_packet_internal().
Checking it during PES writing is too late.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 May 2012 11:40:40 +0000 (13:40 +0200)]
mpegtsenc: fix delay type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Wed, 9 May 2012 02:02:01 +0000 (04:02 +0200)]
fate: employ better names and add a convenient shorthand for vp6 tests
Michael Niedermayer [Fri, 11 May 2012 01:33:59 +0000 (03:33 +0200)]
dcaenc: fix out of array read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 11 May 2012 00:45:34 +0000 (02:45 +0200)]
ffmpeg: fix deinterlace
Fixes ticket1295
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Thu, 10 May 2012 16:40:30 +0000 (17:40 +0100)]
arm/neon: dsputil: use correct size specifiers on vld1/vst1
Change the size specifiers to match the actual element sizes
of the data. This makes no practical difference with strict
alignment checking disabled (the default) other than somewhat
documenting the code. With strict alignment checking on, it
avoids trapping the unaligned loads.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 10 May 2012 15:24:33 +0000 (16:24 +0100)]
arm: dsputil: prettify some conditional instructions in put_pixels macros
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 23 Apr 2012 11:51:28 +0000 (12:51 +0100)]
vqavideo: change x/y loop counters to the usual pattern
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 10 May 2012 11:19:10 +0000 (12:19 +0100)]
avconv: use lrint() for rounding double timestamps
Converting the double to float for lrintf() loses precision when
the value is not exactly representable as a single-precision float.
Apart from being inaccurate, this causes discrepancies in some
configurations due to differences in rounding.
Note that the changed timestamp in the vc1-ism test is a bogus,
made-up value.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Thu, 10 May 2012 20:41:29 +0000 (22:41 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (25 commits)
rv40dsp x86: MMX/MMX2/3DNow/SSE2/SSSE3 implementations of MC
ape: Use unsigned integer maths
arm: dsputil: fix overreads in put/avg_pixels functions
h264: K&R formatting cosmetics for header files (part II/II)
h264: K&R formatting cosmetics for header files (part I/II)
rtmp: Implement check bandwidth notification.
rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF player.
rtmp: Support 'rtmp_flashver', an option which overrides the version of the Flash plugin.
rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target stream.
cmdutils: Add fallback case to switch in check_stream_specifier().
sctp: be consistent with socket option level
configure: Add _XOPEN_SOURCE=600 to Solaris preprocessor flags.
vcr1enc: drop pointless empty encode_init() wrapper function
vcr1: drop pointless write-only AVCodecContext member from VCR1Context
vcr1: group encoder code together to save #ifdefs
vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments
mov: make one comment slightly more specific
lavr: replace the SSE version of ff_conv_fltp_to_flt_6ch() with SSE4 and AVX
lavfi: move audio-related functions to a separate file.
lavfi: remove some audio-related function from public API.
...
Conflicts:
cmdutils.c
libavcodec/h264.h
libavcodec/h264_mvpred.h
libavcodec/vcr1.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/defaults.c
libavfilter/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 May 2012 18:09:37 +0000 (20:09 +0200)]
vf_lut: fix pointer type (const) warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 May 2012 18:06:46 +0000 (20:06 +0200)]
vf_idet: remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 May 2012 18:06:24 +0000 (20:06 +0200)]
vf_idet: fix pointer type (const) warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 May 2012 18:03:29 +0000 (20:03 +0200)]
ffmpeg: fix pointer type (const) warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 May 2012 18:03:13 +0000 (20:03 +0200)]
ffmpeg: remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 May 2012 18:02:49 +0000 (20:02 +0200)]
ffmpeg: fix uninitialized variable warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 May 2012 08:45:30 +0000 (10:45 +0200)]
Revert "Remove libvorbis Vorbis decoding support. Our native decoder is complete"
Its useful to support the official decoder for comparission and debugging.
This reverts commit
f9def9ccc6ecfe1778d4daa62a7ada27b5f79bfc .
Conflicts:
Changelog
configure
libavcodec/allcodecs.c
libavcodec/libvorbis.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 May 2012 17:11:23 +0000 (19:11 +0200)]
avutil/log: allow av_log_set_callback (NULL)
Idea-by: Don Moir <donmoir@comcast.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Thu, 19 Apr 2012 20:36:17 +0000 (22:36 +0200)]
rv40dsp x86: MMX/MMX2/3DNow/SSE2/SSSE3 implementations of MC
Code mostly inspired by vp8's MC, however:
- its MMX2 horizontal filter is worse because it can't take advantage of
the coefficient redundancy
- that same coefficient redundancy allows better code for non-SSSE3 versions
Benchmark (rounded to tens of unit):
V8x8 H8x8 2D8x8 V16x16 H16x16 2D16x16
C 445 358 985 1785 1559 3280
MMX* 219 271 478 714 929 1443
SSE2 131 158 294 425 515 892
SSSE3 120 122 248 387 390 763
End result is overall around a 15% speedup for SSSE3 version (on 6 sequences);
all loop filter functions now take around 55% of decoding time, while luma MC
dsp functions are around 6%, chroma ones are 1.3% and biweight around 2.3%.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 10 May 2012 15:36:49 +0000 (17:36 +0200)]
lavc/utils: fix division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 May 2012 15:22:27 +0000 (17:22 +0200)]
omadec: Check geob datasize more completely
Fixes out of heap array read.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Tue, 28 Feb 2012 16:42:12 +0000 (17:42 +0100)]
ape: Use unsigned integer maths
This involves a division that should be a shift.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Mans Rullgard [Wed, 9 May 2012 23:55:18 +0000 (00:55 +0100)]
arm: dsputil: fix overreads in put/avg_pixels functions
The vertically interpolating variants of these functions read
ahead one line to optimise the loop. On the last line processed,
this might be outside the buffer. Fix these invalid reads by
processing the last line outside the loop.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diego Biurrun [Mon, 7 May 2012 12:13:57 +0000 (14:13 +0200)]
h264: K&R formatting cosmetics for header files (part II/II)
Diego Biurrun [Mon, 7 May 2012 12:13:23 +0000 (14:13 +0200)]
h264: K&R formatting cosmetics for header files (part I/II)
Samuel Pitoiset [Tue, 8 May 2012 22:58:09 +0000 (00:58 +0200)]
rtmp: Implement check bandwidth notification.
According to the behaviour of librtmp, it is recommended to send this
message to the server after receiving the 'onBWDone' callback in order
to do bandwidth checking and improve compatibility with some servers.
Samuel Pitoiset [Wed, 9 May 2012 00:12:16 +0000 (02:12 +0200)]
rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF player.
Samuel Pitoiset [Wed, 9 May 2012 00:12:15 +0000 (02:12 +0200)]
rtmp: Support 'rtmp_flashver', an option which overrides the version of the Flash plugin.
Samuel Pitoiset [Wed, 9 May 2012 00:12:14 +0000 (02:12 +0200)]
rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target stream.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 10 May 2012 02:13:25 +0000 (04:13 +0200)]
cdg: fix pts
Fixes Ticket1226
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 May 2012 23:32:51 +0000 (01:32 +0200)]
avfiltergraph: improve pick_format()
without this the recent changes to format/sink handling would cause a regression in fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 May 2012 00:14:44 +0000 (02:14 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
libxvid: Give more suitable names to libxvid-related files.
libxvid: Separate libxvid encoder from libxvid rate control code.
jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse().
fate: cosmetics: lowercase some comments
fate: Give more consistent names to some RealVideo/RealAudio tests.
lavfi: add avfilter_get_audio_buffer_ref_from_arrays().
lavfi: add extended_data to AVFilterBuffer.
lavc: check that extended_data is properly set in avcodec_encode_audio2().
lavc: pad last audio frame with silence when needed.
samplefmt: add a function for filling a buffer with silence.
samplefmt: add a function for copying audio samples.
lavr: do not try to copy to uninitialized output audio data.
lavr: make avresample_read() with NULL output discard samples.
fate: split idroq audio and video into separate tests
fate: improve dependencies
fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests
fate: split some combined tests into separate audio and video tests
fate: fix dependencies for probe tests
mips: intreadwrite: fix inline asm for gcc 4.8
mips: intreadwrite: remove unnecessary inline asm
...
Conflicts:
cmdutils.h
configure
doc/APIchanges
doc/filters.texi
ffmpeg.c
ffplay.c
libavcodec/internal.h
libavcodec/jpeglsdec.c
libavcodec/libschroedingerdec.c
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
libavcodec/utils.c
libavcodec/version.h
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.h
tests/Makefile
tests/fate/aac.mak
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/image.mak
tests/fate/libavutil.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vqf.mak
tests/ref/fate/ea-mad
tests/ref/fate/ea-tqi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 9 May 2012 22:07:20 +0000 (00:07 +0200)]
Add tools/ffeval to .gitignore.
Diego Biurrun [Wed, 11 Apr 2012 08:31:02 +0000 (10:31 +0200)]
cmdutils: Add fallback case to switch in check_stream_specifier().
This fixes the warning:
cmdutils.c:897: warning: ‘type’ may be used uninitialized in this function
Sean McGovern [Wed, 9 May 2012 06:13:16 +0000 (02:13 -0400)]
sctp: be consistent with socket option level
Replace SOL_SCTP by the more portable IPPROTO_SCTP.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Sean McGovern [Wed, 9 May 2012 06:13:15 +0000 (02:13 -0400)]
configure: Add _XOPEN_SOURCE=600 to Solaris preprocessor flags.
This is needed to expose some networking APIs.
Signed-off-by: Diego Biurrun <diego@biurrun.de>