Michael Niedermayer
5ff2b33401
Merge commit '6f1960ab71b4f18551243ce22d01913108265233'
...
* commit '6f1960ab71b4f18551243ce22d01913108265233':
idct: cosmetics: Drop one unnecessary if-block level
Conflicts:
libavcodec/idctdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 21:53:20 +02:00
Michael Niedermayer
eb2def0ff2
Merge commit '444c73583d2848a542330c03949e1f933ac68f53'
...
* commit '444c73583d2848a542330c03949e1f933ac68f53':
configure: Only run gas checks on ARM and PowerPC
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 21:38:58 +02:00
Michael Niedermayer
0472c5f8a1
Merge commit '0026e356d044e72b6e743b234708b8b8af457ac0'
...
* commit '0026e356d044e72b6e743b234708b8b8af457ac0':
configure: Die if gas is unavailable under aarch64 as well as ARM
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 21:38:12 +02:00
Michael Niedermayer
a698efbc9d
Merge commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472'
...
* commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472':
mpeg: K&R formatting cosmetics
Conflicts:
libavformat/mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 21:31:54 +02:00
Michael Niedermayer
fd1e4d66f1
Merge commit '454697603e4efdfc04fadec40518d56c7dc1e5dd'
...
* commit '454697603e4efdfc04fadec40518d56c7dc1e5dd':
mpegts: Use av_free() to free memory allocated by av_strdup()
Conflicts:
libavformat/mpegtsenc.c
See: 92deb28945
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 21:25:32 +02:00
Justin Jacobs
87dc8b3af9
avformat/matroskadec: Check avpriv_new_chapter() for failure
...
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 21:16:30 +02:00
Diego Biurrun
6f1960ab71
idct: cosmetics: Drop one unnecessary if-block level
2014-08-08 11:13:29 -07:00
Clément Bœsch
1ba7c6ead2
avfilter/dctdnoiz: use 32-bit (float) operations instead of 64 (double) for DCTs
...
This makes the code about 1.5x faster without any noticeable difference
in the output.
2014-08-08 20:00:14 +02:00
Clément Bœsch
eb16a6d229
avfilter/dctdnoiz: remove forward declarations after previous commit
2014-08-08 20:00:14 +02:00
Clément Bœsch
aaf82dc0fa
avfilter/dctdnoiz: make color [de]correlation less clumsy
...
This has no impact on overall performance, since the block DCT taking
most of the time anyway.
2014-08-08 20:00:13 +02:00
Muhammad Faiz
94494dab91
avfilter/showcqt: add and extend tlength and volume options
...
Add a tlength option with frequency and timeclamp variable
Add to the volume option support for frequency and timeclamp variable,
a_weighting, b_weighting and c_weighting functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 18:59:02 +02:00
Marek Fort
d1e750cd51
avformat/mov: Support reading Avid's metadata for DNXHD codec.
...
The AALP atom is necessary to properly decode the alpha channel.
Needed for ticket #3707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 18:39:04 +02:00
Carl Eugen Hoyos
f73d75384f
Autodetect webp files.
2014-08-08 16:14:18 +02:00
Carl Eugen Hoyos
e4d983e2db
configure: Check if libwebp compilation will succeed.
2014-08-08 16:06:10 +02:00
Diego Biurrun
444c73583d
configure: Only run gas checks on ARM and PowerPC
...
Standalone GNU assembly is not used on x86.
2014-08-08 05:30:32 -07:00
Diego Biurrun
0026e356d0
configure: Die if gas is unavailable under aarch64 as well as ARM
2014-08-08 05:30:32 -07:00
Luca Barbato
e4c9e59a45
mpeg: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-08 05:22:09 -07:00
Diego Biurrun
454697603e
mpegts: Use av_free() to free memory allocated by av_strdup()
2014-08-08 03:12:57 -07:00
James Almer
d34ec64a22
replace calls to url_feof() with avio_feof()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 00:48:38 +02:00
James Almer
5c3c67126f
lavf/avio: rename url_feof() to avio_feof()
...
It's a public function and should use the avio_ namespace
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 00:48:22 +02:00
Mark Reid
f1e626a357
avformat/mov: read reel_name metadata from tmcd atom
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:37:55 +02:00
Michael Niedermayer
92a28e9f56
avformat/mpegtsenc: Use av_freep() for pids
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:04:32 +02:00
Michael Niedermayer
31eaecfee9
avformat/mpegtsenc: Free services array completely on failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:04:23 +02:00
Michael Niedermayer
12b59e57f3
avformat/mpegtsenc: Use correct deallocation code on failure of pids array allocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:02:10 +02:00
Michael Niedermayer
5f8300afc6
mpegtsenc: Check dynarray_add() for failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:02:10 +02:00
Michael Niedermayer
92deb28945
avformat/mpegtsenc: use the correct deallocation functions
...
Found-by: Carl Eugen Hoyos <ce@hoyos.ws>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:01:51 +02:00
Michael Niedermayer
efcf1fcad3
Merge commit '5b220e1e19c17b202d83d9be0868d152109ae8f0'
...
* commit '5b220e1e19c17b202d83d9be0868d152109ae8f0':
mpegts: Fix memory leaks and related crashes in mpegs_write_header()
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 22:11:37 +02:00
Michael Niedermayer
3224a319c0
Merge commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc'
...
* commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc':
mpegts: Avoid unnecessary variable shadowing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 22:06:06 +02:00
Michael Niedermayer
066d776501
Merge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'
...
* commit '6d6bd3a3db24747ae5e10716f4782129c38951f6':
mpegts: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 21:42:34 +02:00
Clément Bœsch
cec59eb63f
avfilter/dctdnoiz: add 8x8 dct and make it the default
...
8x8 is about 5x faster than 16x16 on 1080p input. Since a block size of
8x8 makes the filter almost usable (time wise) and it's not obvious if
8x8 or 16x16 is better from a quality PoV (it really depends on the
input and parameters), the filter now defaults to 8x8, and as a result
libavfilter is micro bumped.
2014-08-07 21:24:12 +02:00
Michael Niedermayer
ec0b08d20b
Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'
...
* commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50':
mpegts: K&R formatting cosmetics
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 21:16:06 +02:00
Michael Niedermayer
c6a596f626
doc/APIchanges: Correct function reference.
...
The commit bb789016d4
un-deprecated sws_getContext()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 21:00:46 +02:00
Michael Niedermayer
4917fecf4a
Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'
...
* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
swscale: Undeprecate sws_getContext()
Conflicts:
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:52:40 +02:00
Michael Niedermayer
a561662fb7
Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'
...
* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d':
avcodec: Undeprecate reordered_opaque
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:43:11 +02:00
Michael Niedermayer
2bf87dcc2d
Merge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651'
...
* commit 'a7e541c9926d531a100ba0d36f4e56956dd84651':
h264: fix interpretation of interleved stereo modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:22:16 +02:00
Marek Fort
4e70104aba
avformat/movenc: XMP metadata support.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:11:09 +02:00
Marek Fort
054c506e3d
avformat/mov: XMP metadata suppor.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:11:09 +02:00
Clément Bœsch
06362ab750
avfilter/dctdnoiz: rewrite [f/i]dct
...
This removes the avcodec dependency and make the code almost twice as
fast. More to come.
The DCT factorization is based on "Fast and numerically stable
algorithms for discrete cosine transforms" from Gerlind Plonkaa &
Manfred Tasche (DOI: 10.1016/j.laa.2004.07.015).
2014-08-07 19:59:07 +02:00
Diego Biurrun
5b220e1e19
mpegts: Fix memory leaks and related crashes in mpegs_write_header()
2014-08-07 07:52:17 -07:00
Diego Biurrun
f8ab9f2fe3
mpegts: Avoid unnecessary variable shadowing
2014-08-07 07:52:17 -07:00
Diego Biurrun
6d6bd3a3db
mpegts: Drop some unnecessary parentheses
2014-08-07 07:52:17 -07:00
Diego Biurrun
b7b1bf9166
mpegts: K&R formatting cosmetics
2014-08-07 07:48:54 -07:00
Michael Niedermayer
75bd83d448
avdevice/lavfi: Simplify non-AV stream check
...
Fixes a clang warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 15:41:17 +02:00
Michael Niedermayer
8fa695a9e3
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Do not automatically map subtitles if the decoder and encoder properties are different.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 14:51:59 +02:00
James Almer
350f4be12d
lavf: remove nonexistent functions from the version file
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 13:35:35 +02:00
James Almer
dd2b0c1cde
lavc: remove nonexistent functions from the version file
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 13:20:59 +02:00
Carl Eugen Hoyos
7d585bc94c
Do not automatically map subtitles if the decoder and encoder properties are different.
...
Fixes ticket #3819 .
2014-08-07 13:18:00 +02:00
James Almer
1fd880cef3
lavd/dshow: use av_codec_get_id()
...
ff_codec_get_id() is a lavf internal function
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 13:03:17 +02:00
Diego Biurrun
bb789016d4
swscale: Undeprecate sws_getContext()
...
sws_getCachedContext is not a full replacement for the function.
2014-08-07 04:03:00 -07:00
Diego Biurrun
ad1ee5fa75
avcodec: Undeprecate reordered_opaque
...
It allows attaching other external, opaque data to the frame and passing it
through the reordering process, for cases when the caller wants other data
than just the plain packet pts. There is no way to cleanly achieve this
without the field.
2014-08-07 04:03:00 -07:00