Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-14 03:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
ffmpeg/libswresample
History
Michael Niedermayer d46c1c72e4 Merge commit 'e6153f173a' 
* commit 'e6153f173a':
  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
..
x86 Fix compilation with yasm-0.6.2. 2012-09-01 10:59:16 +02:00
audioconvert.c swr: fix warning: passing argument 2 of ctx->simd_f from incompatible pointer type 2012-07-02 17:31:16 +02:00
audioconvert.h swr: add int16_to_int32_mmx/sse 2012-04-28 13:15:44 +02:00
dither.c swr: change sample format representation so as to maintain the planer/packed distinction. 2012-04-28 13:02:58 +02:00
libswresample.v libswresample.v: add swresample* for cmdutils.c 2011-12-22 04:47:52 +01:00
Makefile buildsys: fix rules for swresample-test 2012-06-05 17:27:38 +02:00
rematrix.c swr: fix warning: passing argument 2 of s->mix_any_f from incompatible pointer type 2012-07-02 17:33:27 +02:00
rematrix_template.c swr: fix mix* related function pointer warnings 2012-07-02 17:23:22 +02:00
resample.c swr/resample: update SSSE3 flag to new name 2012-09-01 01:29:36 +02:00
resample_template.c swr: MMX2 & SSSE3 int16 resample core 2012-06-28 00:36:27 +02:00
swresample-test.c swr-test: support "--help" 2012-06-05 17:27:38 +02:00
swresample.c Merge commit 'e6153f173a' 2012-09-05 14:33:32 +02:00
swresample.h swr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-23 19:23:39 +02:00
swresample_internal.h swr: resampling: add filter type and Kaiser window beta to AVOptions 2012-07-23 19:23:39 +02:00