RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 16:22:37 +00:00
Code Issues Projects Releases Wiki Activity
2d56f0d054
ffmpeg/libavresample
History
Michael Niedermayer 3d7218d932 Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 
* commit '449511740f06a4675b0066730fa45cdb764ffafc':
  build: handle library dependencies in configure

Conflicts:
	common.mak
	configure
	libavdevice/Makefile
	libavfilter/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-13 22:40:32 +02:00
..
aarch64 Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113' 2014-04-25 01:19:27 +02:00
arm
x86 Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8' 2014-04-05 19:16:39 +02:00
audio_convert.c Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924' 2014-04-22 23:33:07 +02:00
audio_convert.h Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924' 2014-04-22 23:33:07 +02:00
audio_data.c
audio_data.h
audio_mix_matrix.c
audio_mix.c
audio_mix.h
avresample-test.c
avresample.h
avresampleres.rc
dither.c
dither.h
internal.h Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113' 2014-04-25 01:19:27 +02:00
libavresample.v
Makefile Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
options.c
resample_template.c Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83' 2014-04-11 20:39:04 +02:00
resample.c Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113' 2014-04-25 01:19:27 +02:00
resample.h Merge commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec' 2014-04-25 01:17:15 +02:00
utils.c Merge commit 'ac976ed91e323754e9a84509873ebdb437372797' 2014-04-13 14:33:42 +02:00
version.h