Michael Niedermayer
da8b70b810
Merge commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9'
...
* commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9':
configure: force -nologo- when detecting MSVC
Conflicts:
configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-24 00:44:58 +02:00
Michael Niedermayer
c6965f62a2
Merge commit '44f7df0c987965763c609f6dc36974b04182e58d'
...
* commit '44f7df0c987965763c609f6dc36974b04182e58d':
dds: Write the palette in the native endian form
Conflicts:
libavcodec/dds.c
See: 36a87c2dc7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 21:30:28 +02:00
Steve Lhomme
a54e720e02
configure: force -nologo- when detecting MSVC
...
The -nologo- option is the inverse of -nologo, reenabling printing the
"logo" version header. This is useful if the compiler actually is a
wrapper that forces -nologo.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-07-23 22:28:08 +03:00
Tom Butterworth
64539e1213
avcodec/hap: (trivial) rename enum values and document their meaning
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 20:59:57 +02:00
Tom Butterworth
26e8247c1c
avcodec/hap: (trivial) clarify comment
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 20:57:52 +02:00
Martin Storsjö
44f7df0c98
dds: Write the palette in the native endian form
...
This fixes the palette on big endian, broken (or, differing from
little endian) since 57214b2f7
.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-07-23 19:07:43 +03:00
Tom Butterworth
11f3d5c69b
hap: Name enums, remove unused struct member
2015-07-23 13:35:16 +01:00
Tom Butterworth
083cbc930d
snappy: Refactor so ff_snappy_uncompress() uses an existing buffer
...
Some uses of Snappy require uncompressing to positions within
an existing buffer. Also adds a function to get the uncompressed
length of Snappy data.
2015-07-23 13:35:16 +01:00
Alexandra Hájková
7f388c0fab
asfdec: remove the wrong condition
...
this condition breaks reading from the pipe as data_reached variable
have to be set to break while in the asf_read_header just after the Data
Object is found
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-07-23 10:50:27 +02:00
Tom Butterworth
ae5a8dca67
hap: Fix slice size computation
...
A bug was introduced in 977105407c
whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-23 10:46:19 +02:00
Tom Butterworth
ebe8b5d947
dds: Fix the slice size computation
...
A bug was introduced in 6b2b26e7af
whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-23 10:45:40 +02:00
Anton Khirnov
22ecfcd4c7
af_channelmap: properly set the supported output channel layouts
...
The current code expects query_formats() to be called exactly once, it
will leak if it's not called at all (filter initialized, but never
configured or used) or try to read freed memory if it's called more than
once.
Found-by: James Almer <jamrial@gmail.com>
CC: libav-stable@libav.org
2015-07-23 09:53:55 +02:00
Alexandra Hájková
aed7715b8f
asfdec: increment nb_streams right after the stream allocation
...
to prevent possible memory leaks
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-07-23 09:48:26 +02:00
Alexandra Hájková
ee80f834cb
asfdec: set nb_streams to 0 in the asf_read_close
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-07-23 09:47:59 +02:00
Paul B Mahol
e59315c4ab
doc/filters.texi: fix two typos in reverse filter description
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-23 07:35:54 +00:00
Paul B Mahol
625bf6a55c
avfilter/vf_reverse: check also pts_size when reallocating
...
Fixes crash of x32.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-23 07:11:52 +00:00
Michael Niedermayer
cb59d29fd6
Merge commit '11f3d5c69b711a1f1631961921ecd20d31f8336d'
...
* commit '11f3d5c69b711a1f1631961921ecd20d31f8336d':
hap: Name enums, remove unused struct member
Conflicts:
libavcodec/hap.h
See: 440c26e9c4
See: d8488090e5
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 18:43:59 +02:00
Michael Niedermayer
efa1e26122
Merge commit '083cbc930d077651ea7e3fbc32ec45352cfed7e7'
...
* commit '083cbc930d077651ea7e3fbc32ec45352cfed7e7':
snappy: Refactor so ff_snappy_uncompress() uses an existing buffer
Conflicts:
libavcodec/hapdec.c
libavcodec/snappy.c
See: 17ee24af7e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 17:52:46 +02:00
Michael Niedermayer
8eff61fd45
avcodec/mips/vp9_idct_msa: Replace __volatile__ by volatile
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 17:38:01 +02:00
Shivraj Patil
c03800d592
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 idct functions
...
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 17:29:55 +02:00
Ivan Uskov
d50ab820da
libavcodec/qsvdec_h264.c: refactoring: functionality of qsv_process_data() has been moved into qsvdec.c
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 17:10:39 +02:00
Shivraj Patil
fd7eadd25c
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 lpf functions
...
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 16:52:18 +02:00
Nicolas George
52c75d486e
lavc/hevc: rudimentary support for skip_loop_filter.
...
+~9% speed on Core i5 on test sample.
All frames are treated as ref frames, skipping only applies
at level "all". The following mail contains information on
how to improve that:
http://ffmpeg.org/pipermail/ffmpeg-devel/2015-July/176116.html
2015-07-23 16:26:14 +02:00
Michael Niedermayer
744051a57a
avcodec/hevc_parse: Print the name of the NAL units in addition to the numerical nal_unit_type in the debug output
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 16:05:20 +02:00
Michael Niedermayer
0a03271ef6
Merge commit '7f388c0fabc51eca3106e7cc443393269435ab52'
...
* commit '7f388c0fabc51eca3106e7cc443393269435ab52':
asfdec: remove the wrong condition
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 12:45:00 +02:00
Michael Niedermayer
b04b021005
Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'
...
* commit 'ae5a8dca675ee544178225256893e679b750cb63':
hap: Fix slice size computation
Conflicts:
libavcodec/hapdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 12:35:10 +02:00
Michael Niedermayer
157fa73992
Merge commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360'
...
* commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360':
dds: Fix the slice size computation
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 12:20:53 +02:00
Michael Niedermayer
9c31b39641
Merge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4'
...
* commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4':
af_channelmap: properly set the supported output channel layouts
Conflicts:
libavfilter/af_channelmap.c
See: 39867f3e09
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 11:57:45 +02:00
Michael Niedermayer
40e8ade9eb
Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'
...
* commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6':
asfdec: increment nb_streams right after the stream allocation
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 11:43:56 +02:00
Michael Niedermayer
cd4c878934
Merge commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff'
...
* commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff':
asfdec: set nb_streams to 0 in the asf_read_close
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 11:34:40 +02:00
James Almer
a176bbc873
avutil/softfloat: move av_sincos_sf() back to header
...
Fixes compilation of host tool aacps_fixed_tablegen
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-22 23:12:21 -03:00
Ivan Uskov
1acb19d12b
libavcodec/qsvdec_h264.c: SPS parsing is now performed by MFXVideoDECODE_DecodeHeader() in libavcodec/qsvdec.c
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 03:48:00 +02:00
Michael Niedermayer
f467fc02b4
tests/checkasm/h264pred: Use LOCAL_ALIGNED_16()
...
Fixes alignment issue and bus errors
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 00:44:02 +02:00
Michael Niedermayer
9e83ac6114
tests/checkasm/h264qpel: Use LOCAL_ALIGNED_16()
...
Fixes alignment issue and bus errors
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 00:35:18 +02:00
Jovan Zelincevic
9e3135f49e
Edit documentation and versioning for the fixed point AAC decoder
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 23:25:33 +02:00
Nedeljko Babic
a9d986c2ce
avcodec: Minor macro polishing
...
Use macros from aac_defines.h for adding suffixes
instead of local macros.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 23:23:29 +02:00
Michael Niedermayer
4845f6687d
fate: Make ffprobe tests depend on avdevice
...
The test file they use needs avdevice to be created
Probably fixes Ticket 4455
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 22:26:10 +02:00
Nedeljko Babic
978a8540b6
tests: Add aac_fixed decoder test
...
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 21:51:37 +02:00
Djordje Pesut
5fd81cf6f0
avcodec: Implementation of AAC_fixed_decoder (PS-module)
...
Add fixed point implementation.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 21:51:28 +02:00
Jovan Zelincevic
631496e057
avcodec: Table creation for AAC_fixed_decoder (PS-module)
...
Add fixed point implementation of functions for generating tables.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 21:51:22 +02:00
Michael Niedermayer
5362df2ee3
avcodec: remove unused sd variables
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 21:04:17 +02:00
Michael Niedermayer
3d083f6ffd
avformat/dump: Also print pict_type in dump_sidedata() for AV_PKT_DATA_QUALITY_STATS
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 21:04:17 +02:00
Michael Niedermayer
975257ffe6
avcodec/libx264: Export choosen pict_type
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 20:49:01 +02:00
Michael Niedermayer
caba19a5be
avcodec/dnxhdenc: Set pict type for AV_PKT_DATA_QUALITY_STATS correctly
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 20:46:52 +02:00
Michael Niedermayer
557e011bf1
avcodec/libxavs: Export pict_type in side data
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 19:52:04 +02:00
Michael Niedermayer
c40ecffd31
Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATS
...
The stats are a superset of the quality factor, also allowing the picture type and encoder "PSNR" stats to be exported
This also replaces the native by fixed little endian order for the affected side data
AV_PKT_DATA_QUALITY_FACTOR is left as a synonym of AV_PKT_DATA_QUALITY_STATS
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 19:31:52 +02:00
Donny Yang
a906e86a8d
apng: Fix decoding images with the PREVIOUS dispose op
2015-07-22 16:42:24 +00:00
Michael Niedermayer
1d7fa1ac89
Merge commit '21c90d86d27c2143354c7d782050a779b0986eb1'
...
* commit '21c90d86d27c2143354c7d782050a779b0986eb1':
mpegvideo: Add missing include
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 18:08:07 +02:00
Michael Niedermayer
d231d2be71
Merge commit 'a16854892c3af945d3ab0015699a0c9884f0a89a'
...
* commit 'a16854892c3af945d3ab0015699a0c9884f0a89a':
dds: Add a rgba fate test
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 17:59:24 +02:00
Paul B Mahol
787d370e14
avfilter: add deband filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-22 15:52:02 +00:00