1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavresample
James Almer 6fdd35a312 Merge commit '92db5083077a8b0f8e1050507671b456fd155125'
* commit '92db5083077a8b0f8e1050507671b456fd155125':
  build: Generate pkg-config files from Make and not from configure
  build: Store library version numbers in .version files

Includes cherry-picked commits 8a34f36593 and
ee164727dd to fix issues.

Changes were also made to retain support for raise_major and build_suffix.

Reviewed-by: ubitux
Merged-by: James Almer <jamrial@gmail.com>
2017-05-04 19:59:30 -03:00
..
aarch64 Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec' 2016-05-09 16:25:28 +01:00
arm Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec' 2016-05-09 16:25:28 +01:00
tests Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 2016-06-22 13:44:34 +02:00
x86 x86inc: Drop SECTION_TEXT macro 2015-08-11 11:12:01 +02:00
audio_convert.c Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 2015-04-20 03:19:47 +02:00
audio_convert.h Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924' 2014-04-22 23:33:07 +02:00
audio_data.c Merge commit 'cc4c24208159200b7aff5b5c313903c7f23fa345' 2016-01-02 10:13:58 +01:00
audio_data.h Merge commit 'cc4c24208159200b7aff5b5c313903c7f23fa345' 2016-01-02 10:13:58 +01:00
audio_mix_matrix.c Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e' 2014-10-18 22:53:23 +02:00
audio_mix.c Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 2015-04-20 03:19:47 +02:00
audio_mix.h
avresample.h Merge commit 'a1d9de304fe63614e3aa8117fef17491fa80093d' 2017-04-03 20:41:16 +02:00
avresampleres.rc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
dither.c
dither.h Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 2016-06-21 21:55:34 +02:00
internal.h Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08' 2015-02-22 00:06:23 +01:00
libavresample.v build: Change structure of the linker version script templates 2016-05-29 16:43:11 +02:00
Makefile Merge commit '92db5083077a8b0f8e1050507671b456fd155125' 2017-05-04 19:59:30 -03:00
options.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
resample_template.c Merge commit '254c95cdd1b669a722204a4a65974fc2523c8f83' 2014-04-11 20:39:04 +02:00
resample.c Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 2016-06-21 21:55:34 +02:00
resample.h Merge commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec' 2014-04-25 01:17:15 +02:00
utils.c Merge commit 'cc4c24208159200b7aff5b5c313903c7f23fa345' 2016-01-02 10:13:58 +01:00
version.h Bump versions for master after 3.3 2017-04-02 19:54:12 +02:00