Michael Niedermayer [Tue, 28 Aug 2012 20:29:20 +0000 (22:29 +0200)]
rtpenc_xiph: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 28 Aug 2012 18:35:04 +0000 (20:35 +0200)]
gitignore: add scaling_video example.
Stefano Sabatini [Tue, 28 Aug 2012 18:06:45 +0000 (20:06 +0200)]
examples/Makefile: remove duplicated -f switch
$(RM) already includes that flag.
Spotted-by: ubitux
Stefano Sabatini [Tue, 21 Aug 2012 12:43:51 +0000 (14:43 +0200)]
examples: add scaling_video example
This example should be useful to show the basic functionality of the
libswscale API.
More advanced features (scaling options etc., colorspace tweaking) may be
added later.
Jérémy Tran [Tue, 28 Aug 2012 16:41:06 +0000 (18:41 +0200)]
lavfi: add smartblur filter
This is a port of the MPlayer smartblur filter (libmpcodecs/vf_smartblur.c)
by Michael Niedermayer.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Nicolas George [Mon, 20 Aug 2012 19:06:39 +0000 (21:06 +0200)]
ffmpeg: report max time of unfinished streams in stats.
Eliminating finished streams avoids the progress stopping
with the first stream.
Using the max instead of the min avoids the progress stopping
with gaps in sparse streams (subtitles).
Negligible change for normal circumstances.
Xidorn Quan [Tue, 28 Aug 2012 12:11:47 +0000 (20:11 +0800)]
add myself as vda decoder maintainer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Tue, 28 Aug 2012 14:41:16 +0000 (07:41 -0700)]
lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Aug 2012 14:28:48 +0000 (16:28 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1: export some functions
configure: use HOSTCC_C/O in check_host_cc
configure: use AS_O setting in check_as
configure: use LD_O setting in check_ld()
Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."
build: Restore dependency of acelp_filters.o on celp_math.o
celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
celp_math: Move ff_cos() to the only place it is used
build: Use portable abstraction for linker/hostcc output file syntax
configure: Fix shared library creation for OpenBSD
vp56: Don't use DECLARE_ALIGN on a typedef name
mss1: move code that will be reused by MSS2 decoder into separate file
mss1: merge decode_intra() and decode_inter()
avprobe: Get rid of ugly casts in the options table
vf_hqdn3d: Remove a duplicate inline declaration
Conflicts:
Makefile
configure
ffprobe.c
libavcodec/Makefile
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/celp_math.c
libavcodec/celp_math.h
libavcodec/dsputil.c
libavcodec/lsp.c
libavcodec/mss1.c
libavcodec/ra288.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 28 Jul 2012 13:09:56 +0000 (15:09 +0200)]
tools: add make_chlayout_test perl script.
This script uses the flite source to produce files
suitable to test channels order and layout.
Nicolas George [Sun, 29 Jul 2012 22:34:01 +0000 (00:34 +0200)]
cmdutils: add -layouts option.
Extract of the output:
| Individual channels:
| NAME DESCRIPTION
| FL front left
| FR front right
| <snip>
| SDR surround direct right
|
| Standard channel layouts:
| NAME DECOMPOSITION
| mono FC
| stereo FL+FR
| <snip>
| octagonal FL+FR+FC+BL+BR+BC+SL+SR
| downmix DL+DR
Derek Buitenhuis [Mon, 27 Aug 2012 02:09:10 +0000 (22:09 -0400)]
vp56: Don't use DECLARE_ALIGN on a typedef name
Instead, use it on the first member, since by definition, if
any member is aligned, the whole struct must be, in order to
maintain that alignment.
Fixes compilation with some finicky compilers, like a mix of libclang/msvc
Idea for fix from Måns Rullgård.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Mon, 27 Aug 2012 17:21:00 +0000 (19:21 +0200)]
vc1: export some functions
This is a preparatory step for the MSS2 decoder which needs to use
the WMV9 decoder to decode some kinds of frames.
From the patch by Alberto Delmás <adelmas@gmail.com>
Michael Niedermayer [Tue, 28 Aug 2012 03:19:48 +0000 (05:19 +0200)]
vf_hqdn3d: remove duplicate inline
This should fix compilation with gcc 3
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Aug 2012 02:11:14 +0000 (04:11 +0200)]
allcodecs: fix vda order
Found-by: compn
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Aug 2012 02:10:50 +0000 (04:10 +0200)]
configure: fix vda order
Found-by: compn
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Xidorn Quan [Sat, 25 Aug 2012 13:25:27 +0000 (21:25 +0800)]
vdadec: implement vda decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 28 Aug 2012 01:18:21 +0000 (03:18 +0200)]
aiffdec: support QDM2
Fixes ticket204
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Mon, 27 Aug 2012 21:19:42 +0000 (22:19 +0100)]
configure: use HOSTCC_C/O in check_host_cc
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 27 Aug 2012 21:19:06 +0000 (22:19 +0100)]
configure: use AS_O setting in check_as
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Mon, 27 Aug 2012 21:04:25 +0000 (22:04 +0100)]
configure: use LD_O setting in check_ld()
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 25 Aug 2012 11:34:55 +0000 (12:34 +0100)]
Revert "dsputil: make {add/put/put_signed}_pixels_clamped() non-static."
This reverts commit
484a337cd7cd8bb180c4a1bd3321881f1c874a92.
These functions were used in
f8bed30 "VC1: merge idct8x8, coeff
adjustments and put_pixels" which was reverted in
18b6a69.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diego Biurrun [Mon, 27 Aug 2012 19:05:52 +0000 (21:05 +0200)]
build: Restore dependency of acelp_filters.o on celp_math.o
Diego Biurrun [Sun, 26 Aug 2012 09:29:39 +0000 (11:29 +0200)]
celp_math: Replace duplicate ff_dot_productf() by ff_scalarproduct_c()
Diego Biurrun [Sun, 26 Aug 2012 15:27:12 +0000 (17:27 +0200)]
celp_math: Move ff_cos() to the only place it is used
Diego Biurrun [Mon, 27 Aug 2012 03:09:29 +0000 (05:09 +0200)]
build: Use portable abstraction for linker/hostcc output file syntax
Brad Smith [Sun, 26 Aug 2012 20:23:06 +0000 (16:23 -0400)]
configure: Fix shared library creation for OpenBSD
OpenBSD does not expect or require symlinked shared libraries with
just the major version in the name.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Derek Buitenhuis [Mon, 27 Aug 2012 00:57:08 +0000 (20:57 -0400)]
vp56: Don't use DECLARE_ALIGN on a typedef name
Instead, use it on the first member, since by definition, if
any member is aligned, the whole struct must be, in order to
maintain that alignment.
Fixes compilation with some finicky compilers.
Idea for fix from Måns Rullgård.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Kari Lentz [Fri, 24 Aug 2012 19:37:47 +0000 (15:37 -0400)]
movenc: support for itunes tempo tag
Implements support for tmpo atom for mp4 files, typically used to store BPM. -metadata "tmpo=127" as a command line option will record 127 as the BPM in the meta data.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 26 Aug 2012 10:59:38 +0000 (12:59 +0200)]
cllc: simplify/fix swapped data buffer allocation.
Using the malloc variant avoids pointless memcpy on size
increase and simplifies handling allocation failure.
Also change code to ensure that allocation, bswap and bitstream
reader all use the same size, even when the packet size is odd
for example.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Georg Lippitsch [Sun, 26 Aug 2012 12:51:13 +0000 (14:51 +0200)]
dpx: 10 and 12 bit decoding
Rewrite 10 bit dpx decoder to decode into GBRP10 color space
instead of converting to RGB48.
Add 12 bit decoder to decode into GBRP12 color space.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Sun, 26 Aug 2012 12:16:07 +0000 (14:16 +0200)]
mss1: move code that will be reused by MSS2 decoder into separate file
Kostya Shishkov [Sun, 26 Aug 2012 11:46:57 +0000 (13:46 +0200)]
mss1: merge decode_intra() and decode_inter()
They have most of their code in common.
Martin Storsjö [Mon, 27 Aug 2012 11:07:12 +0000 (14:07 +0300)]
avprobe: Get rid of ugly casts in the options table
This also makes sure the function pointers are stored via the same
union member as they are accessed via.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 27 Aug 2012 14:50:59 +0000 (16:50 +0200)]
aiffdec: try #2 to fix bps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Aug 2012 14:32:44 +0000 (16:32 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_hqdn3d: Don't declare the loop variable within the for loop
huffyuv: update to current coding style
huffman: update to current coding style
rtsp: Free the rtpdec context properly
build: fft: x86: Drop unused YASM-OBJS-FFT- variable
Conflicts:
libavcodec/huffman.c
libavcodec/huffyuv.c
libavcodec/x86/Makefile
libavfilter/vf_hqdn3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 27 Aug 2012 12:55:43 +0000 (15:55 +0300)]
vf_hqdn3d: Remove a duplicate inline declaration
Compilation seems to fail on GCC 3.4 due to this duplicate
declaration.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 27 Aug 2012 09:33:42 +0000 (12:33 +0300)]
vf_hqdn3d: Don't declare the loop variable within the for loop
This C99 feature is generally not used in the libav codebase,
since it breaks building with some fringe compilers (GCC 2.95,
MSVC).
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Mon, 27 Aug 2012 10:30:13 +0000 (12:30 +0200)]
huffyuv: update to current coding style
Luca Barbato [Mon, 27 Aug 2012 10:29:34 +0000 (12:29 +0200)]
huffman: update to current coding style
Martin Storsjö [Fri, 17 Aug 2012 19:22:17 +0000 (22:22 +0300)]
rtsp: Free the rtpdec context properly
The condition for calling the rtpdec cleanup was broken in
df8cf076c86.
This fixes a memory leak.
Signed-off-by: Martin Storsjö <martin@martin.st>
Stefano Sabatini [Fri, 24 Aug 2012 15:16:40 +0000 (17:16 +0200)]
examples/decoding_encoding: make operation logic more self-evident / predictable
Add a switch which controls which operation to perform. Useful to test
only a single feature. Also the new behavior is more self-consistent.
Stefano Sabatini [Mon, 27 Aug 2012 08:00:03 +0000 (10:00 +0200)]
examples/Makefile: apply misc minor fixes to the RM rule
Use $(RM) in place of rm, drop useless "-r" for removing files.
Stefano Sabatini [Thu, 23 Aug 2012 18:17:25 +0000 (20:17 +0200)]
examples/decoding_encoding: store temporary files in current dir
Do not clutter the temporary directory with files, also "/tmp" is not
always available, e.g. in Windows.
Also add the clean-test Makefile rule, which will clean the generated
files.
Carl Eugen Hoyos [Mon, 27 Aug 2012 07:14:40 +0000 (09:14 +0200)]
Use correct format identifier for uint64_t.
Michael Niedermayer [Mon, 27 Aug 2012 03:01:51 +0000 (05:01 +0200)]
mpc: fix seeking to the end
Fixes Ticket1689
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 27 Aug 2012 02:51:27 +0000 (04:51 +0200)]
mpc: clip seeking timestamp in valid range
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 26 Aug 2012 16:13:59 +0000 (18:13 +0200)]
build: fft: x86: Drop unused YASM-OBJS-FFT- variable
Michael Niedermayer [Mon, 27 Aug 2012 00:02:37 +0000 (02:02 +0200)]
aiffdec: fix bits per sample
Fixes Ticket1660
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sun, 26 Aug 2012 09:56:47 +0000 (11:56 +0200)]
ffplay: fix odd YUV width by cropping the video
Should fix issue #1322.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
jamal [Sun, 26 Aug 2012 03:19:30 +0000 (00:19 -0300)]
build: Fix compilation when configuring with a prog suffix
Fixes ticket #1676
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Aug 2012 22:36:31 +0000 (00:36 +0200)]
vf_hqdn3d: avoid declaring variable in for()
This should fix compilation with gcc 2.95 and possibly others
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Aug 2012 20:36:13 +0000 (22:36 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
audio_frame_queue: Clean up ff_af_queue_log_state debug function
dwt: Remove unused code.
cavs: convert cavsdata.h to a .c file
cavs: Move inline functions only used in one file out of the header
cavs: Move data tables used in only one place to that file
fate: Add a single symbol Ut Video decoder test
vf_hqdn3d: x86 asm
vf_hqdn3d: support 16bit colordepth
avconv: prefer user-forced input framerate when choosing output framerate
Conflicts:
ffmpeg.c
libavcodec/audio_frame_queue.c
libavcodec/dwt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Aug 2012 21:36:26 +0000 (23:36 +0200)]
nutenc: Support writing an index
The seek test improves in accuracy
Fixes Ticket877
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Aug 2012 21:34:38 +0000 (23:34 +0200)]
nutenc: keep track of max_pts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Aug 2012 21:33:47 +0000 (23:33 +0200)]
nutenc: keep track if keyframe PTS
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Aug 2012 21:30:27 +0000 (23:30 +0200)]
nutdec: Flip the direction for seeking with an index in the failure case.
This is closer to how seeking works without an index
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Aug 2012 21:29:58 +0000 (23:29 +0200)]
nutdec: improve information in error message
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 19 Aug 2012 20:10:57 +0000 (22:10 +0200)]
nutenc: keep track of the written syncpoint count
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 26 Aug 2012 10:44:05 +0000 (12:44 +0200)]
audio_frame_queue: Clean up ff_af_queue_log_state debug function
The function is debug-only, so only compile it in debug mode.
Make it static as it has no uses outside of the file.
Change av_log() to av_dlog().
Diego Biurrun [Sun, 3 Jul 2011 14:56:01 +0000 (16:56 +0200)]
dwt: Remove unused code.
Mans Rullgard [Sun, 26 Aug 2012 07:59:41 +0000 (09:59 +0200)]
cavs: convert cavsdata.h to a .c file
Defining tables in header files is ugly and prone to duplication.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Sun, 26 Aug 2012 07:57:19 +0000 (09:57 +0200)]
cavs: Move inline functions only used in one file out of the header
Diego Biurrun [Sun, 26 Aug 2012 07:19:33 +0000 (09:19 +0200)]
cavs: Move data tables used in only one place to that file
Jan Ekström [Fri, 24 Aug 2012 11:42:41 +0000 (14:42 +0300)]
fate: Add a single symbol Ut Video decoder test
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Loren Merritt [Sun, 26 Aug 2012 10:26:42 +0000 (10:26 +0000)]
vf_hqdn3d: x86 asm
13% faster on penryn, 16% on sandybridge, 15% on bulldozer
Not simd; a compiler should have generated this, but gcc didn't.
Loren Merritt [Sun, 26 Aug 2012 10:26:00 +0000 (10:26 +0000)]
vf_hqdn3d: support 16bit colordepth
Paul B Mahol [Sun, 26 Aug 2012 10:23:54 +0000 (10:23 +0000)]
avrndec: silence warning about incompatible pointer types
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Anton Khirnov [Fri, 24 Aug 2012 15:42:46 +0000 (17:42 +0200)]
avconv: prefer user-forced input framerate when choosing output framerate
Michael Niedermayer [Sun, 26 Aug 2012 03:44:46 +0000 (05:44 +0200)]
h264: ff_init_cabac_states doesnt use its argument thus remove it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 26 Aug 2012 00:10:25 +0000 (02:10 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fft: remove unused fft_dispatch* functions
avconv: remove unused variable opt_shortest
FATE: Add Canopus Lossless tests
cllc: Pad swapped buffer
Conflicts:
ffmpeg_opt.c
tests/ref/fate/cllc-argb
tests/ref/fate/cllc-rgb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 Aug 2012 23:55:10 +0000 (01:55 +0200)]
ac3_probe: fix probing of non standard AC3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sat, 25 Aug 2012 14:57:19 +0000 (15:57 +0100)]
x86: fft: remove unused fft_dispatch* functions
These functions are not used since the yasm conversion.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 25 Aug 2012 10:41:13 +0000 (11:41 +0100)]
avconv: remove unused variable opt_shortest
This was replaced with a per-file value in
3c0df90.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Sat, 25 Aug 2012 21:24:21 +0000 (23:24 +0200)]
lavf: fix avio statistics for packets directly read without the buffer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Thu, 23 Aug 2012 18:17:35 +0000 (18:17 +0000)]
FATE: Add Canopus Lossless tests
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Philip Langdale [Sun, 12 Aug 2012 03:29:20 +0000 (20:29 -0700)]
matroska: Mark S_TEXT/UTF-8 as Subrip encoded subtitles.
While not explicitly stated in the specs, the original author
has stated that S_TEXT/UTF-8 is expected to be text using Subrip
markup, but without Subrip in-band timing.
So, now that we have a decoder that conforms to this expectation,
let's use it.
Note that this change will impact tools that use libavformat. If
they expect srt subtitles to have CODEC_ID_TEXT, they must be
adjusted to expect CODEC_ID_SUBRIP. The actual content is, obviously,
unchanged.
Signed-off-by: Philip Langdale <philipl@overt.org>
Piotr Bandurski [Sat, 25 Aug 2012 11:52:20 +0000 (13:52 +0200)]
riff: fix remuxing of atrac3 in wav
The original codec expects 0 as bps or refuses to play the remuxed file.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 25 Aug 2012 10:53:47 +0000 (10:53 +0000)]
lavc: add some missing .long_name to codec_descriptors[]
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Sat, 25 Aug 2012 06:49:23 +0000 (08:49 +0200)]
Fix one of the problems with -codecs, -encoders and -decoders.
Derek Buitenhuis [Sat, 25 Aug 2012 02:10:19 +0000 (22:10 -0400)]
cllc: Pad swapped buffer
The bitstream buffer must be padded, or the bitstream reader might
read over the end.
Fixes the following valgrind warning:
Use of uninitialised value of size 8 at 0x591BAE: cllc_decode_frame (cllc.c:166)
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Georg Lippitsch [Fri, 24 Aug 2012 13:24:15 +0000 (15:24 +0200)]
dpx: 10 and 12 bit encoding
Encode GBRP10 pixel format into 10 bit DPX.
Encode GBRP12 pixel format into 12 bit DPX.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 24 Aug 2012 15:15:51 +0000 (17:15 +0200)]
examples/decoding_encoding.c: tell where the decoding output files are printed
Stefano Sabatini [Tue, 21 Aug 2012 16:13:14 +0000 (18:13 +0200)]
examples/muxing: update to the new avcodec_encode_video2() API
Michael Niedermayer [Fri, 24 Aug 2012 15:19:43 +0000 (17:19 +0200)]
doc/developer: add "Adding files to the fate-suite dataset"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Aug 2012 12:51:51 +0000 (14:51 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
utvideodec: Fix single symbol mode decoding
truespeech: drop useless casts
libavcodec: drop bogus dependencies from mpc[78] and qdm2
mpegaudio: move ff_mpa_enwindow to a separate file
AVOptions: store defaults for INT64 options in int64 union member.
Conflicts:
libavcodec/Makefile
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Aug 2012 12:22:38 +0000 (14:22 +0200)]
Merge commit '
a1bcc76e6036e78f25cbb7323c145056cfca9d93'
* commit '
a1bcc76e6036e78f25cbb7323c145056cfca9d93': (21 commits)
cmdutils: fix a memleak when specifying an option twice.
x86: mpegvideo: more sensible names for optimization file and init function
x86: mpegvideoenc: Split optimizations off into a separate file
dnxhdenc: x86: more sensible names for optimization file and init function
svq1/svq3: Move common code out of SVQ1 decoder-specific file
dirac: add Comments and references to the standard
lavr: x86: optimized 6-channel flt to fltp conversion
lavr: x86: optimized 2-channel flt to fltp conversion
lavr: x86: optimized 6-channel flt to s16p conversion
lavr: x86: optimized 2-channel flt to s16p conversion
lavr: x86: optimized 6-channel s16 to fltp conversion
lavr: x86: optimized 2-channel s16 to fltp conversion
lavr: x86: optimized 6-channel s16 to s16p conversion
lavr: x86: optimized 2-channel s16 to s16p conversion
lavr: x86: optimized 2-channel fltp to flt conversion
lavr: x86: optimized 6-channel fltp to s16 conversion
lavr: x86: optimized 2-channel fltp to s16 conversion
lavr: x86: optimized 6-channel s16p to flt conversion
lavr: x86: optimized 2-channel s16p to flt conversion
lavr: x86: optimized 6-channel s16p to s16 conversion
...
Conflicts:
libavcodec/dirac.c
libavcodec/mpegvideo.h
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 24 Aug 2012 03:39:30 +0000 (05:39 +0200)]
rtpdec_xiph: switch to av_assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 23 Aug 2012 10:31:47 +0000 (12:31 +0200)]
lavfi/asetpts,setpts: rework debug log
Show more information, and only the information stored in the values
array. Improve debugging usefulness.
Stefano Sabatini [Thu, 23 Aug 2012 10:29:20 +0000 (12:29 +0200)]
lavfi/asetpts,setpts: add variables T, STARTT, PREV_INT and PREV_OUTT
Jan Ekström [Thu, 23 Aug 2012 20:32:06 +0000 (23:32 +0300)]
utvideodec: Fix single symbol mode decoding
Put the zero length check in place of code that was never used
during decoding, as zero-length slices were generally refused
in decode_frame().
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Stefano Sabatini [Thu, 23 Aug 2012 09:56:35 +0000 (11:56 +0200)]
doc/filters: itemize examples for *settb filters
Stefano Sabatini [Thu, 23 Aug 2012 09:52:45 +0000 (11:52 +0200)]
doc/filters: itemize examples for *setpts filters
Stefano Sabatini [Thu, 23 Aug 2012 09:48:23 +0000 (11:48 +0200)]
doc/filters: move *setpts and *settb filters to the multimedia filters section
Since audio and video filters are explained together and share most code,
the multimedia filters section seems more fitting.
Stefano Sabatini [Thu, 23 Aug 2012 09:46:55 +0000 (11:46 +0200)]
lavfi: rename vf_setpts.c to f_setpts.c
The file contains the asetpts audio filter.
Nicolas George [Sun, 19 Aug 2012 17:10:48 +0000 (19:10 +0200)]
lavc/dvdsubenc: check the type of rectangles.
Avoid a crash if a text rectangle is provided.
Fix the segfault reported in trac ticket #1661.
Mans Rullgard [Thu, 23 Aug 2012 18:47:29 +0000 (19:47 +0100)]
truespeech: drop useless casts
These values already have the correct types.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 23 Aug 2012 17:48:13 +0000 (18:48 +0100)]
libavcodec: drop bogus dependencies from mpc[78] and qdm2
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Thu, 23 Aug 2012 17:47:49 +0000 (18:47 +0100)]
mpegaudio: move ff_mpa_enwindow to a separate file
This table is used only by mpegaudiodsp and mpegaudioenc. Separating
it allows dropping some dependencies from mpc[78] and qdm2.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Anton Khirnov [Thu, 23 Aug 2012 07:18:06 +0000 (09:18 +0200)]
cmdutils: fix a memleak when specifying an option twice.