generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
62,144 Commits 24 Branches 241 Tags 173 MiB
849a8c4cdb
Commit Graph

393 Commits

Author SHA1 Message Date
Michael Niedermayer
cc4a41727e swr: fix "may be used uninitialized in this function" warnings 
The uninitialized use implicates 0 channels, which is unlikely
to reach this function but fixed anyway in this commit.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-20 17:09:48 +01:00
Michael Niedermayer
55d0528669 swr/dither: fix division by 0 
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-14 02:57:00 +01:00
Michael Niedermayer
d676598f87 swr: fix handling of timestamps that cause multiple drops or silence injections 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 18:39:06 +01:00
Michael Niedermayer
a34aee4646 swr: limit buffer size for silence injection 
This reduces memory usage for unreasonable large silence injections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 16:04:41 +01:00
Michael Niedermayer
b481d09bd9 swr: limit buffer size for discarding. 
This prevents insane memory usage in case of insane input values.
Untested due to lack of a testcase that causes such insane allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 16:04:41 +01:00
Michael Niedermayer
db4e0ecaf0 swr: move silence buffer to context to avoid per use malloc/free 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 15:28:00 +01:00
Michael Niedermayer
dc6588421e swr: move buffer used to discard sample to context 
This avoids the need to allocate & free to repeatly

Fixes Ticket2122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-13 15:28:00 +01:00
Michael Niedermayer
c8737d348b swr: work with 4 noise shaping coeffs at a time 
63->38 kcycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 19:17:08 +01:00
Michael Niedermayer
93bc0f0180 swr/noise_shaping_data: pad coeffs to multiple of 4 when they are 1 below 
This allows using code working with 4 at a time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 19:09:54 +01:00
Michael Niedermayer
ef7fdc8cff swr: use a local variable for ns_coeffs 
maybe a very tiny bit faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 17:43:29 +01:00
Michael Niedermayer
68ff7d265f swr: use local variable for ns_errors 
71 -> 63 kcycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 17:43:29 +01:00
Michael Niedermayer
b5d9e5d06c swr: minor simplification for the noise shaping pos update 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-12 17:43:29 +01:00
Michael Niedermayer
a74548521b swr: check that allocation of in/out_convert succeeded 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 20:27:07 +01:00
Michael Niedermayer
e5a736261b swr: Use a temporary buffer for dither/Noise shaping when the input is read only 
This avoids copying the input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 18:51:30 +01:00
Michael Niedermayer
2eec98125e swr: mark noise data for noise shaping as const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 18:07:32 +01:00
Michael Niedermayer
558aa6cab7 swr: add seperate in/out pointers to the noise shaping code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 18:06:19 +01:00
Michael Niedermayer
fca51256d4 swr: rename dither_pos to noise_pos 
THis more closely matches what the field represents

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 18:01:26 +01:00
Michael Niedermayer
2672b2c1d2 swr: scale data down in noise shaping to avoid cliping 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 01:44:15 +01:00
Michael Niedermayer
0b60fc94aa swr: reorder the operations in the noise shaping code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 00:27:04 +01:00
Michael Niedermayer
ead3a2a37e swr: add noise_scale field to seperate it from the noise shaping scales 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-10 00:25:09 +01:00
Michael Niedermayer
6908ded20e swr: fix the noise sample type for noise shaping 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-09 23:28:09 +01:00
Michael Niedermayer
3ef06f3415 swr: split swri_dither_init() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-09 23:28:08 +01:00
Michael Niedermayer
8514d5bcf7 swr: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-09 18:41:40 +01:00
Michael Niedermayer
3ab1970612 swr: move dither related fields to their own context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-09 18:41:12 +01:00
Michael Niedermayer
ba1314c2ef swr: update copyright years of a few files iam working on 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-09 18:30:01 +01:00
Michael Niedermayer
82742294b7 swr: Implement Noise shaping dither 
The following variants are implemented:
lipshitz noise shaping dither
shibata noise shaping dither
low shibata noise shaping dither
high shibata noise shaping dither
f-weighted noise shaping dither
modified-e-weighted noise shaping dither
improved-e-weighted noise shaping dither

Data tables taken from SOX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-09 18:25:06 +01:00
Michael Niedermayer
f3c9d8d41b swr: use SIMD for dithering 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-09 02:05:35 +01:00
Michael Niedermayer
9aec63af9b swr: fix assertion failure if dither is used without the preout buffer differing from in 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 20:07:16 +01:00
Alexander Strasser
ac25b31ede lswr: Improve default resampler's default parameters 
After making some blind tests on a small collection of music
samples for home usage. It turned out that the default cutoff
was too low.

The impact of filter_size was not clearly distinguishable (the
results were on the edge) with the music samples but turned out
to be clearly audible in some synthetic samples.

Thanks to Daniel for helping out with the listening tests.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2013-01-04 16:47:57 +01:00
Nicolas George
5f12d5ad78 lswr: improve rematrixing error message. 
Report channel layout/count for insufficiently determined
rematrixing.
 2012-12-31 18:43:04 +01:00
Rob Sykes
8d9a503313 docs: add soxr documentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-27 12:13:17 +01:00
Rob Sykes
03d38ee207 soxr_resample: soxr API parameter rename 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-27 11:59:55 +01:00
Rob Sykes
f2957adb23 soxr_resample: Correct email address 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-27 11:58:16 +01:00
Michael Niedermayer
f9e55c0fed swr: support -async X as a simple way to do what ffmpeg -async X did 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 17:21:09 +01:00
Clément Bœsch
0212c1c43d swr/doxy: fix missing quote in code example. 2012-12-16 21:04:54 +01:00
Michael Niedermayer
d18706244f audioconvert/arm: require alignment of 16 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-14 04:49:09 +01:00
Michael Niedermayer
ceb9f8d927 audioconvert: support simd code with specific alignment requirements. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-14 04:47:17 +01:00
Rob Sykes
801b315729 swr: Add SOX resampler support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 22:04:00 +01:00
Rob Sykes
41049d07f2 swr: add a lowpass default so that each Resampler can have its own default. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 22:04:00 +01:00
Michael Niedermayer
ae5a55e77a swr: move flush into Resampler 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 22:04:00 +01:00
Michael Niedermayer
431dcc49d2 swr: make realloc_audio() available outside swresample.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 22:04:00 +01:00
Rob Sykes
5a5d70748c swr: Add API to make resample engine selectable. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 22:04:00 +01:00
Michael Niedermayer
5595e7a102 doxy: fix swr group name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-11 01:53:18 +01:00
Michael Niedermayer
b6a7f66f93 resample: remove disabled debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-06 02:51:26 +01:00
Clément Bœsch
2273b3aaf9 swr: remove unused ONE define. 2012-12-05 23:04:01 +01:00
Stefano Sabatini
8bee8f778a lswr/swresample: use AV_OPT_TYPE_SAMPLE_FMT for sample format options 
Improve usability and robustness.
 2012-12-03 13:49:56 +01:00
Clément Bœsch
52b7823b73 swr: include stdint.h instead of inttypes.h. 
stdint.h is for the [u]int*_t types, which is the only thing we need for
the prototypes. inttypes.h includes stdint.h and defines more thing we
don't need here.

Bump micro in case a user app was relying on this include for its own
code.
 2012-11-20 21:53:06 +01:00
Clément Bœsch
186942a5e3 swr: fix a few typo in the public header. 2012-11-20 20:29:05 +01:00
Michael Niedermayer
156a75a459 swr-doxy: elaborate on swr_get_delay() and the timebase 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 20:05:08 +01:00
Michael Niedermayer
7cca237ddd swr: general doxy text about swr and example code. 
Based on doxy from avr
Reviewed-by: Clément Bœsch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-20 19:46:08 +01:00
Clément Bœsch
c02ae48271 swr: set default channel count options to 0. 
If not set, they will be defined using the channel layout setting, which
is much more convenient when using swr_alloc() instead of
swr_alloc_set_opts().
 2012-11-19 18:49:14 +01:00
Clément Bœsch
8f42b09604 swr/resample: fix SSSE3 included unconditionally. 
10l Regression since 8ea88339.
 2012-11-15 23:52:44 +01:00
Clément Bœsch
5e68bf9b92 swr/rematrix: move templating parameters to template itself. 2012-11-15 21:24:49 +01:00
Clément Bœsch
8ea8833979 swr/resample: move templating parameters to template itself. 
It has various benefits such as allowing some refactoring, clarifying
the code in the inclusion part, and making the template understandable
in standalone.

This commit is based on the templating method used by Justin Ruggles for
libavresample.
 2012-11-15 21:24:49 +01:00
Michael Niedermayer
d53f447130 swr: move if() block into the only branch where it can be true. 
This should make the code a tiny tiny bit faster.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-15 12:33:40 +01:00
Michael Niedermayer
17da2d9eee swr: reorder/redesign operations to avoid integer overflow. 
This fixes a out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-15 12:33:40 +01:00
Paul B Mahol
1acd2f6ba7 Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h 
Also remove it in once case when it is not needed.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-13 13:21:21 +00:00
Stefano Sabatini
6450c05ba5 lswr/swresample: adopt globally consistent rules for options help message 
The help text tells what the option does, not what the accepted parameter
is. Thus convert strings of the kind:

Bikeshed Color
to
set bikeshed color
 2012-11-03 20:38:02 +01:00
Stefano Sabatini
7be09a91c2 lswr/swresample.h: use consistent inclusion guard header name 2012-11-03 12:06:43 +01:00
Michael Niedermayer
3174616f59 Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 
* commit '6860b4081d046558c44b1b42f22022ea341a2a73':
  x86: include x86inc.asm in x86util.asm
  cng: Reindent some incorrectly indented lines
  cngdec: Allow flushing the decoder
  cngdec: Make the dbov variable have the right unit
  cngdec: Fix the memset size to cover the full array
  cngdec: Update the LPC coefficients after averaging the reflection coefficients
  configure: fix print_config() with broke awks

Conflicts:
	libavcodec/x86/ac3dsp.asm
	libavcodec/x86/dct32.asm
	libavcodec/x86/deinterlace.asm
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputilenc.asm
	libavcodec/x86/fft.asm
	libavcodec/x86/fmtconvert.asm
	libavcodec/x86/h264_chromamc.asm
	libavcodec/x86/h264_deblock.asm
	libavcodec/x86/h264_deblock_10bit.asm
	libavcodec/x86/h264_idct.asm
	libavcodec/x86/h264_idct_10bit.asm
	libavcodec/x86/h264_intrapred.asm
	libavcodec/x86/h264_intrapred_10bit.asm
	libavcodec/x86/h264_weight.asm
	libavcodec/x86/vc1dsp.asm
	libavcodec/x86/vp3dsp.asm
	libavcodec/x86/vp56dsp.asm
	libavcodec/x86/vp8dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-31 13:43:33 +01:00
Michael Niedermayer
d23e8f53ad swr: use 64bit index/len for x86_64 mix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-28 02:09:08 +02:00
Hendrik Leppkes
04bf2e7f0e swresample: include ff_log2_tab for shared builds 
This is done in accordance with all other libraries, which no longer access ff_log2_tab from avutil directly for shared builds, and instead obtain their own copy.

This change is required for MSVC DLL builds, as well as avoids accessing a private symbol from another library.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 01:58:04 +02:00
Michael Niedermayer
9de5b11d58 swr-test: fix division by 0 
Fixes CID733739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 19:40:57 +02:00
Michael Niedermayer
dd3e5baa59 swr-test: check pointers before use 
Fixes: CID733807, CID733806
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-16 19:39:25 +02:00
Michael Niedermayer
555f352f99 swr/rematrix: fix C99 left shift overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 03:48:05 +02:00
Michael Niedermayer
7df9f595c9 swri_resample_init: unsupported sample formats are an internal error. 
This condition cannot happen.

Fixes CID733802
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 04:36:23 +02:00
Michael Niedermayer
13a215236b swr-test: avoid VLA 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-06 13:48:47 +02:00
jamal
a70b4935f1 Add missing version macros to libraries 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-28 15:10:18 +02:00
jamal
b75c3d2b8b swresample: Create version.h header 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-28 15:10:36 +02:00
Mans Rullgard
7e3208a087 ARM: libswresample: NEON optimised generic fltp to s16 conversion 
Adapted to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 23:19:32 +02:00
Michael Niedermayer
97599f8c6d swr: make sure the last data element is NULL so we can use it to detect the number of channels 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 23:19:32 +02:00
Mans Rullgard
5dc7363446 ARM: libswresample: NEON optimised stereo fltp to s16 conversion 
Adaption to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 23:16:14 +02:00
Mans Rullgard
0eebde07a9 ARM: libswresample: NEON optimised flat float to s16 conversion 
Adapted to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 23:16:14 +02:00
Michael Niedermayer
9d89d1d484 swr/resample: mark mm_flags as potentially unused 
They are unused when asm is disabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-13 19:31:02 +02:00
Michael Niedermayer
31a797eb28 swr: add av_cold to init/free functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-09 02:26:20 +02:00
Michael Niedermayer
0e78e575ed swr/auto_matrix: treat a single channel as mono instead of failing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 21:32:24 +02:00
Michael Niedermayer
f8d74cbdc3 swr/auto_matrix: treat stereo downmix like stereo. 
Based on code by John Stebbins
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 21:12:40 +02:00
Michael Niedermayer
c8ffab06f4 swr/auto_matrix: add clean layout function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 21:10:19 +02:00
Michael Niedermayer
ebc854e4e9 swr/auto_matrix: move layouts to local variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-08 20:58:57 +02:00
Michael Niedermayer
070b0e1c77 libswr: remove redundant ARCH_X86, MMX* implicates X86 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-07 22:31:37 +02:00
Derek Buitenhuis
5f256f9df2 swsresample: Fix unprotected inline asm 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-07 22:29:02 +02:00
Michael Niedermayer
c5278cb84f Add Dolby/DPLII downmix support to libswresample 
Based on code by John Stebbins <jstebbins.hb@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-07 00:41:49 +02:00
Michael Niedermayer
2dd2e42951 swr: update rematrix coeffs to match AC-3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-07 00:29:06 +02:00
Michael Niedermayer
323d912010 swr: update copyright years 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-07 00:29:06 +02:00
Michael Niedermayer
d46c1c72e4 Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9' 
* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9':
  avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member

Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/mpeg12enc.c
	libavcodec/options_table.h
	libavcodec/snowenc.c
	libavcodec/tiffenc.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/af_amix.c
	libavfilter/af_asyncts.c
	libavfilter/af_join.c
	libavfilter/buffersrc.c
	libavfilter/src_movie.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawtext.c
	libavformat/http.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/movenc.c
	libavformat/mpegenc.c
	libavformat/mpegtsenc.c
	libavformat/options_table.h
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-05 14:33:32 +02:00
Michael Niedermayer
99de3df3d3 Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078' 
* commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078':
  avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member

Conflicts:
	libavcodec/libvpxenc.c
	libavcodec/options_table.h
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-05 14:09:09 +02:00
Michael Niedermayer
d5f65e9d40 Merge commit '124134e42455763b28cc346fed1d07017a76e84e' 
* commit '124134e42455763b28cc346fed1d07017a76e84e':
  avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member

Conflicts:
	libavcodec/aacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/options_table.h
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/af_amix.c
	libavfilter/vf_drawtext.c
	libavformat/movenc.c
	libavformat/options_table.h
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-05 13:58:11 +02:00
Carl Eugen Hoyos
a26789cf9f Fix compilation with yasm-0.6.2. 2012-09-01 10:59:16 +02:00
Michael Niedermayer
4814326533 swr/resample: update SSSE3 flag to new name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-01 01:29:36 +02:00
Carl Eugen Hoyos
52be5428c0 Add some missing _EXTERNAL suffixes to yasm source files. 2012-08-31 15:39:03 +02:00
Michael Niedermayer
15a0fb58a3 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>
 2012-08-24 15:00:39 +02:00
Michael Niedermayer
9f088a1ed4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpegvideo: reduce excessive inlining of mpeg_motion()
  mpegvideo: convert mpegvideo_common.h to a .c file
  build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO
  Move MASK_ABS macro to libavcodec/mathops.h
  x86: move MANGLE() and related macros to libavutil/x86/asm.h
  x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h
  aacdec: Don't fall back to the old output configuration when no old configuration is present.
  rtmp: Add message tracking
  rtsp: Support mpegts in raw udp packets
  rtsp: Support receiving plain data over UDP without any RTP encapsulation
  rtpdec: Remove an unused include
  rtpenc: Remove an av_abort() that depends on user-supplied data
  vsrc_movie: discourage its use with avconv.
  avconv: allow no input files.
  avconv: prevent invalid reads in transcode_init()
  avconv: rename OutputStream.is_past_recording_time to finished.

Conflicts:
	configure
	doc/filters.texi
	ffmpeg.c
	ffmpeg.h
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/mpegvideo.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-09 19:31:56 +02:00
Michael Niedermayer
4ec03d1386 bessel: check that the function terminates as expected by av_assert2(). 
A clear abort is better than wrong output and a possible crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-09 01:44:15 +02:00
Michael Niedermayer
b9df3f4f6c swr: fix 10l typo mixing in and out config. 
Fixes ticket1458

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-01 21:18:03 +02:00
Justin Ruggles
7e15df7551 swr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-23 19:23:39 +02:00
Nicolas George
1d903a5ee4 lswr: channel_map requires input conversion. 
channel_map is applied between in and postin.
Without this test, if the input format is an acceptable internal format,
the in->postin conversion is skipped. In the best case,
it ignores channel_map, in the worst case it causes an assert failure
if the number of channels is changed by the map.
 2012-07-17 09:50:36 +02:00
Michael Niedermayer
68712ce820 swr/x86: 16bit integer mix functions need SSE2 not SSE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 20:52:34 +02:00
Paul B Mahol
1842b27564 lavu: 256 color support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-07 01:41:55 +00:00
Michael Niedermayer
c88e60af76 swr/x86: 10l, missed some SSE2 instructions in code marked as SSE. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-05 15:28:10 +02:00
Michael Niedermayer
7309451d73 swr: fix warning: passing argument 2 of s->mix_any_f from incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-02 17:33:27 +02:00