ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 12:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,425 Commits 36 Branches 398 Tags 534 MiB
release/3.1
Commit Graph

287 Commits

Author SHA1 Message Date
Clément Bœsch
5d48e4eafa Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 
* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196':
  tests: Move all test programs to a subdirectory

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-22 13:44:34 +02:00
Clément Bœsch
8ef57a0d61 Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 21:55:34 +02:00
Diego Biurrun
a6a750c7ef tests: Move all test programs to a subdirectory 2016-05-13 14:55:56 +02:00
Derek Buitenhuis
ca5ec2bf51 Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec' 
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
  build: miscellaneous cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-09 16:25:28 +01:00
Vittorio Giovara
41ed7ab45f cosmetics: Fix spelling mistakes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-05-04 18:16:21 +02:00
Diego Biurrun
01621202aa build: miscellaneous cosmetics 
Restore alphabetical order in lists, break overly long lines, do some
prettyprinting, add some explanatory section comments, group parts
together that belong together logically.
 2016-04-07 15:26:08 +02:00
Hendrik Leppkes
d1262262de Merge commit 'cc4c24208159200b7aff5b5c313903c7f23fa345' 
* commit 'cc4c24208159200b7aff5b5c313903c7f23fa345':
  avresample: Mark avresample_buffer() as pointer to const

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-01-02 10:13:58 +01:00
Kip Warner
cc4c242081 avresample: Mark avresample_buffer() as pointer to const 
That buffer is read only and marking it accordingly let
the user passing a constant buffer to it without having
a const-correctness warning.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-12-14 15:16:33 +01:00
Hendrik Leppkes
240ac53a5c Merge commit 'e2854e731f843906d9a9a5b882bed872341999fd' 
* commit 'e2854e731f843906d9a9a5b882bed872341999fd':
  avresample: Document avresample_open() a little better

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-11-10 18:07:41 +01:00
Luca Barbato
e2854e731f avresample: Document avresample_open() a little better 
Bug-Id: 911
 2015-11-05 17:25:46 +01:00
Ganesh Ajjanagadde
84dfc426ce avresample: Remove an unused variable 
This fixes a -Wunused-variable warning.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-09-29 14:33:01 +02:00
Ganesh Ajjanagadde
39ca7641c8 avresample/resample: remove unused variable 
This fixes a -Wunused-variable, see e.g
http://fate.ffmpeg.org/log.cgi?time=20150919162338&log=compile&slot=x86_64-archlinux-gcc-threads.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-19 23:40:34 +02:00
Hendrik Leppkes
c2972a2800 Merge commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b' 
* commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b':
  lavr: Remove unreachable code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:19:36 +02:00
Vittorio Giovara
c7247eb7fe lavr: Remove unreachable code 
Bug-Id: CID 1323180
 2015-09-13 17:34:45 +02:00
Hendrik Leppkes
b8346b2294 Merge commit '9a003fc38833b6b9f08e44d7f1c6539db65840a0' 
* commit '9a003fc38833b6b9f08e44d7f1c6539db65840a0':
  lavr: Remove unused label

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 12:26:13 +02:00
Hendrik Leppkes
160e92c8bf Merge commit 'e88103a7f92cf27a2868b50acc8a9912f6088249' 
* commit 'e88103a7f92cf27a2868b50acc8a9912f6088249':
  Bump major versions of all libraries

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 21:35:46 +02:00
Hendrik Leppkes
e2adb00ec5 Merge commit '11b2eed43e91b35b8295ed47115cae2e29bd687d' 
* commit '11b2eed43e91b35b8295ed47115cae2e29bd687d':
  lavr: Drop deprecated context reinitialization if resampling was not enabled

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 15:59:40 +02:00
Vittorio Giovara
9a003fc388 lavr: Remove unused label 2015-08-31 15:24:41 +02:00
Vittorio Giovara
e88103a7f9 Bump major versions of all libraries 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-08-28 16:04:28 +02:00
Vittorio Giovara
11b2eed43e lavr: Drop deprecated context reinitialization if resampling was not enabled 
Deprecated in 11/2012.
 2015-08-28 10:55:36 +02:00
Henrik Gramner
ab43beefab x86inc: Drop SECTION_TEXT macro 
The .text section is already 16-byte aligned by default on all supported
platforms so `SECTION_TEXT` isn't any different from `SECTION .text`.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-08-11 11:12:01 +02:00
Henrik Gramner
f0b7882ceb x86inc: Drop SECTION_TEXT macro 
The .text section is already 16-byte aligned by default on all supported
platforms so `SECTION_TEXT` isn't any different from `SECTION .text`.
 2015-08-04 20:13:09 +02:00
Michael Niedermayer
b66b1a103f Merge commit 'd68c05380cebf563915412182643a8be04ef890b' 
* commit 'd68c05380cebf563915412182643a8be04ef890b':
  x86: check for AV_CPU_FLAG_AVXSLOW where useful

See: c16e99e3b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-01 00:22:47 +02:00
James Almer
d68c05380c x86: check for AV_CPU_FLAG_AVXSLOW where useful 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-05-31 12:07:11 +02:00
Michael Niedermayer
215430e049 Merge commit '0ac8ff618c5e6d878c547a8877e714ed728950ce' 
* commit '0ac8ff618c5e6d878c547a8877e714ed728950ce':
  avresample: Reallocate the internal buffer to the correct size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-29 05:46:35 +02:00
Luca Barbato
0ac8ff618c avresample: Reallocate the internal buffer to the correct size 
Fixes the corner case in which the internal buffer size
is larger than input buffer provided and resizing it
before moving the left over samples would make it write
to now unallocated memory.

Bug-Id: 825
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-28 23:51:51 +02:00
Michael Niedermayer
40d552dae6 Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  Replace av_dlog with normal av_log at trace level

Conflicts:
	ffplay.c
	libavdevice/fbdev_dec.c
	libavfilter/avfilter.c
	libavfilter/internal.h
	libavfilter/setpts.c
	libavfilter/src_movie.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fieldorder.c
	libavformat/assdec.c
	libavformat/avidec.c
	libavformat/flvdec.c
	libavformat/http.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/mov.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/mpegtsenc.c
	libavformat/mux.c
	libavformat/mxfdec.c
	libavformat/nsvdec.c
	libavformat/oggdec.c
	libavformat/r3d.c
	libavformat/rtspdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 03:19:47 +02:00
Vittorio Giovara
1a3eb042c7 Replace av_dlog with normal av_log at trace level 
This applies to every library where performance is not critical.
 2015-04-19 12:41:59 +01:00
Michael Niedermayer
db3f6465a6 Merge commit '12655c48049f9a52e5504bde90fe738862b0ff08' 
* commit '12655c48049f9a52e5504bde90fe738862b0ff08':
  libavresample: NEON optimized FIR audio resampling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-22 00:06:23 +01:00
Peter Meerwald
12655c4804 libavresample: NEON optimized FIR audio resampling 
modelled after aarch64 code

on Cortex-A8, s16 and s32 code is about 2x faster,
float code about 7x faster

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-21 22:08:39 +02:00
Michael Niedermayer
7b7f8d3ed0 Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99' 
* commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99':
  libavresample: Annotate AARCH64 init function with av_cold

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-20 22:13:07 +01:00
Peter Meerwald
df0891fc8f libavresample: Annotate AARCH64 init function with av_cold 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-02-20 19:32:37 +02:00
Michael Niedermayer
85cf049d50 Merge commit '963f76144897d3f7684d82ec21e51dd50ea1106e' 
* commit '963f76144897d3f7684d82ec21e51dd50ea1106e':
  avresample: Make sure the even check does not overflow

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-18 22:53:23 +02:00
Michael Niedermayer
9bcc430481 Merge commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f' 
* commit '088eca28164c8cd3b72b0c3d3f9e3fe5ee5cb28f':
  avresample: prevent theoretical division by zero

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-18 22:15:23 +02:00
Luca Barbato
963f761448 avresample: Make sure the even check does not overflow 
CC: libav-stable@libav.org
Bug-Id: CID 732225
 2014-10-18 16:15:10 +01:00
Vittorio Giovara
088eca2816 avresample: prevent theoretical division by zero 
CC: libav-stable@libav.org
Bug-Id: CID 1231986
 2014-10-18 16:15:10 +01:00
Reimar Döffinger
d9e2aceb7f Add missing "const" all over the place. 
Only "./configure --enable-gpl" on x86 was tested.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-29 18:57:25 +02:00
Michael Niedermayer
c939eea107 Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e' 
* commit '11db644a8e54f02e54d2eaad343a87fcb697c15e':
  lavr: Update the planar check in ff_audio_convert

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-17 21:43:06 +02:00
Luca Barbato
11db644a8e lavr: Update the planar check in ff_audio_convert 
Leftover from fbc0b86599.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-08-17 16:11:02 +02:00
Michael Niedermayer
78eaaa857e Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45' 
* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
  avresample: Introduce AVFrame-based API

Conflicts:
	libavresample/utils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 18:20:37 +02:00
Luca Barbato
fb1ddcdc8f avresample: Introduce AVFrame-based API 2014-08-10 14:26:37 +02:00
Michael Niedermayer
a57ece0cb4 Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' 
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
  Bump major versions of all libraries.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h
	libavutil/version.h
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 00:26:45 +02:00
Michael Niedermayer
3e41d2e612 Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e' 
* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
  Postpone API-incompatible changes until the next bump.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 22:19:45 +02:00
Anton Khirnov
1985c2e75c Bump major versions of all libraries. 2014-08-09 16:58:33 +00:00
Anton Khirnov
f4c444e17d Postpone API-incompatible changes until the next bump. 2014-08-09 16:57:10 +00:00
Michael Niedermayer
c62fea7574 Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd' 
* commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd':
  lavr: Do not change the sample format for mono audio

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 02:49:48 +02:00
Justin Ruggles
fbc0b86599 lavr: Do not change the sample format for mono audio 
This treats mono as planar internally within libavresample rather
than changing the sample format.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-08-03 23:13:26 +02:00
Michael Niedermayer
bdb2e80e88 Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342' 
* commit 'b2d45654220503224aa94e78cdff19ec624e9342':
  avresample: Add avresample_get_out_samples

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 01:23:22 +02:00
Luca Barbato
b2d4565422 avresample: Add avresample_get_out_samples 
Utility function to get the upper bound on the number of samples the
resampler would output.
 2014-05-28 22:04:56 +02:00
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