generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
49,453 Commits 24 Branches 241 Tags 173 MiB
91f359292a
Commit Graph

346 Commits

Author SHA1 Message Date
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
Michael Niedermayer
338509c2e1 swr: fix warning: passing argument 1 of s->mix_any_f from incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-02 17:32:23 +02:00
Michael Niedermayer
087d067a99 swr: fix warning: passing argument 2 of ctx->simd_f from incompatible pointer type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-02 17:31:16 +02:00
Michael Niedermayer
04b5eb47a6 swr: fix mix* related function pointer warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-02 17:23:22 +02:00
Michael Niedermayer
51d2578348 swr: fix MMX resample code, add emms 
Fixes Ticket1495

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-30 21:27:39 +02:00
Clément Bœsch
ca612a27ae swr: fix make checkheaders. 2012-06-30 11:21:53 +02:00
Clément Bœsch
022cbb6791 swr: small align cosmetic. 2012-06-30 11:18:45 +02:00
Clément Bœsch
3491c2a909 swr: use __asm__ instead of __asm. 
For consistency only.
 2012-06-30 11:18:05 +02:00
Michael Niedermayer
782763ed2b swr: fix compilation with ancient toolchain that doesnt support SSSE3 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-28 11:13:19 +02:00
Michael Niedermayer
4ccf6e3971 swr: MMX2 & SSSE3 int16 resample core 
about 4 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-28 00:36:27 +02:00
Paul B Mahol
10d2a4028c swresample: make .class_name more descriptive 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-22 14:01:15 +00:00
Stefano Sabatini
065851ffac lswr/rematrix: specify explicitly the name of the unsupported channel layouts 
Help debugging.
 2012-06-21 12:47:47 +02:00
Michael Niedermayer
0c142e4cda swr: introduce filter_alloc in preparation of SIMD resample optimisations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-19 03:09:24 +02:00
Michael Niedermayer
80e857c967 swr/resample: optimize C code for the most common case 
15% speedup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-19 03:09:24 +02:00
Michael Niedermayer
5f8f6243ef swr: fix 10l use of uninitialized data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-13 13:43:42 +02:00
Michael Niedermayer
728f86edfc swr: mix_2_1_int16_mmx/sse 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 17:49:12 +02:00
Michael Niedermayer
d504266cef swr: mix_1_1_int16_sse 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:43:19 +02:00
Michael Niedermayer
cbeeaf2593 swr: mix_1_1 int16 MMX 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:35:13 +02:00
Michael Niedermayer
52afa43691 swr: mix_2_1_float SSE/AVX 
Based-on code by Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:35:13 +02:00
Michael Niedermayer
beb0cd6acf swr: SIMD rematrixing and SSE/AVX mix_1_1 float 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:35:07 +02:00
Michael Niedermayer
48a45f819f swr: add native matrix for SIMD 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:16:15 +02:00
Michael Niedermayer
9abbbf7530 swr: add function pointers for SIMD rematrixing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:12:08 +02:00
Michael Niedermayer
634d539c12 swresample.c: update copyleft year 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 16:11:17 +02:00
Michael Niedermayer
c8553bea9e swr: use &~15 
Idea-by: reimar (and ubitux on IRC)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 10:28:40 +02:00
Michael Niedermayer
4289b6690d swr: replace /16 by >>4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-12 04:01:17 +02:00
Michael Niedermayer
a5c6349358 swr: skip memset(0) in rematrix when the array is known to be already 0 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 02:43:10 +02:00
Michael Niedermayer
75d900d52e swr: zero buffers on allocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-09 02:42:46 +02:00
Michael Niedermayer
e016e3c9d7 swr: add mix8to2 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 22:12:00 +02:00
Michael Niedermayer
b0348158a0 swr: 5.1->stereo double, float and s16 
2.5 times faster than the generic code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 22:02:14 +02:00
Michael Niedermayer
ca30ae12c5 swr: add all in one rematrixing function ptr 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 21:55:33 +02:00
Michael Niedermayer
dfde3d497e swr: add inrermediate sample type for rematrixing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-08 21:54:54 +02:00
Michael Niedermayer
6e6dd9995b resample_template: use av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-06 20:08:57 +02:00
Michael Niedermayer
787c395a30 swr-test: support "--help" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-05 17:27:38 +02:00
Michael Niedermayer
63b1c08073 buildsys: fix rules for swresample-test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-05 17:27:38 +02:00
Michael Niedermayer
5a7a9f02de libswresample/Makefile: put each object on its own line 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-05 17:27:38 +02:00
Clément Bœsch
64df092b25 swr: fix a few typo. 2012-06-01 08:06:36 +02:00
Michael Niedermayer
16e25ef34b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: extend -r to work on any input stream.
  doc/avconv: expand documentation for the -s option.
  avconv: don't print filters inserted by avconv in stream mappings.
  avconv: merge configuration code for complex and simple filters
  avconv: split configuring input filters out of configure_complex_filter

Conflicts:
	configure
	doc/ffmpeg.texi
	ffmpeg.c
	tests/ref/fate/idroq-video-encode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-30 04:38:32 +02:00
Michael Niedermayer
72261fa867 swr: fix swr_drop_output() 
Fixes part of Ticket1341

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 02:33:38 +02:00
Michael Niedermayer
841c1be57e swr: check return value of swr_inject_silence/drop_output. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 20:37:12 +02:00
Michael Niedermayer
a645049bd8 swr: check count argument of realloc_audio() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-22 20:37:12 +02:00
Michael Niedermayer
d1384c00d4 swr: skip soft compensation when its disabled. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 22:42:32 +02:00
Michael Niedermayer
72a242c998 swr: add swr_next_pts() 
parameter descriptions partly reuse text from af_asyncts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
f88f705abc swr: add swr_drop_output() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
7a59964ba9 swr: add swr_inject_silence() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
72872d0201 swr: Fix issue with injecting more data than can be used up in the next call. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
c5c355546d swr: add some asserts to resample() 
These check that the internal and input buffers match in format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
75e25f8540 swr: add reversefill_audiodata() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00
Michael Niedermayer
5027e3daf7 swr: fix buf_set() so it works with input == output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-19 19:23:37 +02:00