]>
git.sesse.net Git - ffmpeg/log
Ivan Uskov [Sat, 25 Jul 2015 16:28:11 +0000 (12:28 -0400)]
avcodec: Add QSV VC-1 video decoder.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 25 Jul 2015 16:39:17 +0000 (18:39 +0200)]
avformat/nutenc: Omit AV_PKT_DATA_QUALITY_STATS when storing side data.
This side data does not serve or improve decoding the data, it thus
would semantically be metadata and not side data.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ivan Uskov [Sat, 25 Jul 2015 14:45:20 +0000 (10:45 -0400)]
avcodec: Add QSV MPEG-2 video decoder.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 25 Jul 2015 13:19:41 +0000 (15:19 +0200)]
avcodec/dvdec: only attempt to conceal errors based on STA inconsistencies when error_concealment is set
This allows the user to disable it in the hypothetical case that STA values are wrong
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 25 Jul 2015 12:07:55 +0000 (14:07 +0200)]
avcodec/aacps: Fix ;;
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 25 Jul 2015 11:22:09 +0000 (13:22 +0200)]
avcodec/aactab: Add ff_aac_eld_window_480_fixed
Fixes pointer type mismatch
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 25 Jul 2015 11:19:06 +0000 (13:19 +0200)]
avcodec/aactab: Fix rounding of elements in ff_aac_eld_window_512_fixed
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 25 Jul 2015 01:15:56 +0000 (03:15 +0200)]
swscale/output: Fix "warning: assignment from incompatible pointer type"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Zhang Rui [Tue, 21 Jul 2015 18:47:26 +0000 (02:47 +0800)]
avformat/async: wake up main thread before exit background thread
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Zhang Rui [Tue, 21 Jul 2015 18:47:25 +0000 (02:47 +0800)]
avformat/async: move more code into locked area in background thread
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 24 Jul 2015 22:18:05 +0000 (00:18 +0200)]
avcodec/dvdec: skip 3rd stage ac decoding when the headers indicates that the data is inconsistent
Fixes Ticket1589
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Shivraj Patil [Thu, 23 Jul 2015 12:55:07 +0000 (18:25 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 intra 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>
Hendrik Leppkes [Fri, 24 Jul 2015 11:16:43 +0000 (13:16 +0200)]
configure: fix LARGEADDRESSAWARE flag with MSVC
Otherwise it would get translated like a library path (-L option),
which breaks setting the flag.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Fri, 24 Jul 2015 19:25:01 +0000 (16:25 -0300)]
avcodec/aacsbr: add missing header include
Fixes make checkheaders
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 24 Jul 2015 18:02:37 +0000 (20:02 +0200)]
Merge commit '
c9edbe4af901e9bc9f05a62319637f9760df9a4a '
* commit '
c9edbe4af901e9bc9f05a62319637f9760df9a4a ':
use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe
See:
58ed7b632842f3fedbe737c3945cabc56bab2f47
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Steve Lhomme [Fri, 24 Jul 2015 07:38:04 +0000 (09:38 +0200)]
use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe
favor link over link.exe in case some wrapper script already exists
fallback to "link" in the path if the one next to cl is not found
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 24 Jul 2015 15:24:57 +0000 (17:24 +0200)]
avcodec/dvdec: Retry decoding seemingly damaged MBs while skiping likely damaged parts
Improves decoding of Ticket1589
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Steve Lhomme [Fri, 24 Jul 2015 07:38:04 +0000 (09:38 +0200)]
use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe
Fallback to "link" in the path if the one next to cl is not found.
Signed-off-by: Martin Storsjö <martin@martin.st>
Paul B Mahol [Fri, 3 Jul 2015 16:13:11 +0000 (16:13 +0000)]
swscale: ayuv64le output support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 3 Jul 2015 12:15:47 +0000 (12:15 +0000)]
swscale: ayuv64le input support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 3 Jul 2015 10:57:58 +0000 (10:57 +0000)]
avutil: add ayuv64le and ayuv64be packed pixel format
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 24 Jul 2015 02:09:53 +0000 (02:09 +0000)]
avfilter: rename vf_reverse.c to f_reverse.c
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 21 Jul 2015 10:43:04 +0000 (10:43 +0000)]
avfilter: add areverse filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Ivan Uskov [Tue, 21 Jul 2015 12:32:09 +0000 (08:32 -0400)]
libavcodec/qsvdec_h264.c: packet buffering has been removed since qsvdec.c does maintain own data buffering now.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ivan Uskov [Fri, 24 Jul 2015 10:26:14 +0000 (06:26 -0400)]
libavcodec/qsvdec.c: The ff_qsv_decode() now guarantees the consumption of whole packet.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 24 Jul 2015 01:25:49 +0000 (03:25 +0200)]
avcodec/hapdec: Check that there is sufficient input data
Fixes Ticket4729
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 23 Jul 2015 22:44:58 +0000 (00:44 +0200)]
Merge commit '
a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9 '
* commit '
a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9 ':
configure: force -nologo- when detecting MSVC
Conflicts:
configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 23 Jul 2015 19:30:28 +0000 (21:30 +0200)]
Merge commit '
44f7df0c987965763c609f6dc36974b04182e58d '
* commit '
44f7df0c987965763c609f6dc36974b04182e58d ':
dds: Write the palette in the native endian form
Conflicts:
libavcodec/dds.c
See:
36a87c2dc7f302da3778bd0cff050b5c93a730c7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Steve Lhomme [Thu, 23 Jul 2015 17:25:44 +0000 (19:25 +0200)]
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>
Tom Butterworth [Thu, 23 Jul 2015 18:44:24 +0000 (14:44 -0400)]
avcodec/hap: (trivial) rename enum values and document their meaning
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Tom Butterworth [Thu, 23 Jul 2015 18:44:23 +0000 (14:44 -0400)]
avcodec/hap: (trivial) clarify comment
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Martin Storsjö [Thu, 23 Jul 2015 14:59:44 +0000 (17:59 +0300)]
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>
Tom Butterworth [Tue, 21 Jul 2015 00:21:39 +0000 (01:21 +0100)]
hap: Name enums, remove unused struct member
Tom Butterworth [Tue, 21 Jul 2015 00:21:38 +0000 (01:21 +0100)]
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.
Alexandra Hájková [Wed, 22 Jul 2015 14:10:25 +0000 (16:10 +0200)]
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>
Tom Butterworth [Wed, 22 Jul 2015 23:01:01 +0000 (00:01 +0100)]
hap: Fix slice size computation
A bug was introduced in
977105407cae55876041dddbf4ce0934cdd4cd6c 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>
Tom Butterworth [Wed, 22 Jul 2015 23:03:29 +0000 (00:03 +0100)]
dds: Fix the slice size computation
A bug was introduced in
6b2b26e7af3ede0abfb46eb5725c26d1083f50bc 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>
Anton Khirnov [Wed, 22 Jul 2015 09:30:37 +0000 (11:30 +0200)]
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
Alexandra Hájková [Thu, 23 Jul 2015 06:59:53 +0000 (08:59 +0200)]
asfdec: increment nb_streams right after the stream allocation
to prevent possible memory leaks
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alexandra Hájková [Wed, 22 Jul 2015 19:38:15 +0000 (21:38 +0200)]
asfdec: set nb_streams to 0 in the asf_read_close
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Paul B Mahol [Thu, 23 Jul 2015 07:35:54 +0000 (07:35 +0000)]
doc/filters.texi: fix two typos in reverse filter description
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 21 Jul 2015 14:40:00 +0000 (14:40 +0000)]
avfilter/vf_reverse: check also pts_size when reallocating
Fixes crash of x32.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 23 Jul 2015 16:01:49 +0000 (18:01 +0200)]
Merge commit '
11f3d5c69b711a1f1631961921ecd20d31f8336d '
* commit '
11f3d5c69b711a1f1631961921ecd20d31f8336d ':
hap: Name enums, remove unused struct member
Conflicts:
libavcodec/hap.h
See:
440c26e9c46bb26bc1fc8306561ed6962ae7d3bf
See:
d8488090e5070187e9d8d0a93b8d841f26bde990
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 23 Jul 2015 15:51:40 +0000 (17:51 +0200)]
Merge commit '
083cbc930d077651ea7e3fbc32ec45352cfed7e7 '
* commit '
083cbc930d077651ea7e3fbc32ec45352cfed7e7 ':
snappy: Refactor so ff_snappy_uncompress() uses an existing buffer
Conflicts:
libavcodec/hapdec.c
libavcodec/snappy.c
See:
17ee24af7e5f7112fe25c734236d521f9e35d80d
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 23 Jul 2015 15:38:01 +0000 (17:38 +0200)]
avcodec/mips/vp9_idct_msa: Replace __volatile__ by volatile
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Shivraj Patil [Wed, 22 Jul 2015 11:42:23 +0000 (17:12 +0530)]
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>
Ivan Uskov [Thu, 23 Jul 2015 09:14:41 +0000 (05:14 -0400)]
libavcodec/qsvdec_h264.c: refactoring: functionality of qsv_process_data() has been moved into qsvdec.c
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Shivraj Patil [Mon, 20 Jul 2015 14:34:31 +0000 (20:04 +0530)]
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>
Nicolas George [Thu, 23 Jul 2015 10:10:14 +0000 (12:10 +0200)]
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
Michael Niedermayer [Thu, 23 Jul 2015 13:56:07 +0000 (15:56 +0200)]
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>
Michael Niedermayer [Thu, 23 Jul 2015 10:44:56 +0000 (12:44 +0200)]
Merge commit '
7f388c0fabc51eca3106e7cc443393269435ab52 '
* commit '
7f388c0fabc51eca3106e7cc443393269435ab52 ':
asfdec: remove the wrong condition
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 23 Jul 2015 10:35:10 +0000 (12:35 +0200)]
Merge commit '
ae5a8dca675ee544178225256893e679b750cb63 '
* commit '
ae5a8dca675ee544178225256893e679b750cb63 ':
hap: Fix slice size computation
Conflicts:
libavcodec/hapdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 23 Jul 2015 10:20:48 +0000 (12:20 +0200)]
Merge commit '
ebe8b5d947c41449c684f17c6826fe6bc46c0360 '
* commit '
ebe8b5d947c41449c684f17c6826fe6bc46c0360 ':
dds: Fix the slice size computation
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 23 Jul 2015 09:56:26 +0000 (11:56 +0200)]
Merge commit '
22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4 '
* commit '
22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4 ':
af_channelmap: properly set the supported output channel layouts
Conflicts:
libavfilter/af_channelmap.c
See:
39867f3e098ab304cd3bef0ace19d73617cdb817
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 23 Jul 2015 09:43:49 +0000 (11:43 +0200)]
Merge commit '
aed7715b8fa295980c221f1cd095d42cd3bd74a6 '
* commit '
aed7715b8fa295980c221f1cd095d42cd3bd74a6 ':
asfdec: increment nb_streams right after the stream allocation
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 23 Jul 2015 09:34:36 +0000 (11:34 +0200)]
Merge commit '
ee80f834cbb6dbacdc1efb4c658a7d775e82ebff '
* commit '
ee80f834cbb6dbacdc1efb4c658a7d775e82ebff ':
asfdec: set nb_streams to 0 in the asf_read_close
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Thu, 23 Jul 2015 01:10:50 +0000 (22:10 -0300)]
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>
Ivan Uskov [Mon, 20 Jul 2015 15:07:34 +0000 (11:07 -0400)]
libavcodec/qsvdec_h264.c: SPS parsing is now performed by MFXVideoDECODE_DecodeHeader() in libavcodec/qsvdec.c
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 22:35:18 +0000 (00:35 +0200)]
tests/checkasm/h264pred: Use LOCAL_ALIGNED_16()
Fixes alignment issue and bus errors
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 22:35:18 +0000 (00:35 +0200)]
tests/checkasm/h264qpel: Use LOCAL_ALIGNED_16()
Fixes alignment issue and bus errors
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jovan Zelincevic [Mon, 20 Jul 2015 11:36:22 +0000 (13:36 +0200)]
Edit documentation and versioning for the fixed point AAC decoder
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Nedeljko Babic [Mon, 20 Jul 2015 11:36:20 +0000 (13:36 +0200)]
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>
Michael Niedermayer [Wed, 22 Jul 2015 17:25:26 +0000 (19:25 +0200)]
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>
Nedeljko Babic [Mon, 20 Jul 2015 11:36:21 +0000 (13:36 +0200)]
tests: Add aac_fixed decoder test
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Djordje Pesut [Mon, 20 Jul 2015 11:36:19 +0000 (13:36 +0200)]
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>
Jovan Zelincevic [Mon, 20 Jul 2015 11:36:18 +0000 (13:36 +0200)]
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>
Michael Niedermayer [Wed, 22 Jul 2015 19:01:56 +0000 (21:01 +0200)]
avcodec: remove unused sd variables
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 19:01:00 +0000 (21:01 +0200)]
avformat/dump: Also print pict_type in dump_sidedata() for AV_PKT_DATA_QUALITY_STATS
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 18:49:01 +0000 (20:49 +0200)]
avcodec/libx264: Export choosen pict_type
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 18:46:52 +0000 (20:46 +0200)]
avcodec/dnxhdenc: Set pict type for AV_PKT_DATA_QUALITY_STATS correctly
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 17:52:04 +0000 (19:52 +0200)]
avcodec/libxavs: Export pict_type in side data
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 21 Jul 2015 11:23:29 +0000 (13:23 +0200)]
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>
Donny Yang [Sun, 19 Jul 2015 02:43:20 +0000 (02:43 +0000)]
apng: Fix decoding images with the PREVIOUS dispose op
Michael Niedermayer [Wed, 22 Jul 2015 16:07:43 +0000 (18:07 +0200)]
Merge commit '
21c90d86d27c2143354c7d782050a779b0986eb1 '
* commit '
21c90d86d27c2143354c7d782050a779b0986eb1 ':
mpegvideo: Add missing include
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 15:39:41 +0000 (17:39 +0200)]
Merge commit '
a16854892c3af945d3ab0015699a0c9884f0a89a '
* commit '
a16854892c3af945d3ab0015699a0c9884f0a89a ':
dds: Add a rgba fate test
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Fri, 10 Jul 2015 16:16:53 +0000 (16:16 +0000)]
avfilter: add deband filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 22 Jul 2015 15:29:34 +0000 (17:29 +0200)]
Merge commit '
d08d8b61aa9f07d3ea993fe5392f7408c958d221 '
* commit '
d08d8b61aa9f07d3ea993fe5392f7408c958d221 ':
dds: Fix 32bpp bitmaps decoding
Conflicts:
libavcodec/dds.c
See:
5c583b141980102530c75d2756b06766742532a1
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 15:26:37 +0000 (17:26 +0200)]
Merge commit '
57214b2f7f9b1ccfd61e232e8989b5ee850f169c '
* commit '
57214b2f7f9b1ccfd61e232e8989b5ee850f169c ':
dds: Fix palette decoding
Conflicts:
libavcodec/dds.c
See:
36a87c2dc7f302da3778bd0cff050b5c93a730c7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 15:13:38 +0000 (17:13 +0200)]
Merge commit '
ea4d46e72945cba37feb7aa154eb970732f513e4 '
* commit '
ea4d46e72945cba37feb7aa154eb970732f513e4 ':
dds: Fix enum declaration
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 15:13:15 +0000 (17:13 +0200)]
Merge commit '
2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec '
* commit '
2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec ':
asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 15:06:16 +0000 (17:06 +0200)]
Merge commit '
93f16f338f9e8aba0c006752eb3afc3fe6e137fd '
* commit '
93f16f338f9e8aba0c006752eb3afc3fe6e137fd ':
asfdec: close the demuxer properly when read_header is failing
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 14:53:20 +0000 (16:53 +0200)]
Merge commit '
5655236a67203d923755f285584c6e68abe7e33f '
* commit '
5655236a67203d923755f285584c6e68abe7e33f ':
asfdec: factor out seeking to the Data Object outside while
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 14:46:01 +0000 (16:46 +0200)]
Merge commit '
ecee1148af4989e1f9e16f0cdc9f98ad2045538c '
* commit '
ecee1148af4989e1f9e16f0cdc9f98ad2045538c ':
qsvenc_hevc: use the correct HW plugin UID
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 14:38:12 +0000 (16:38 +0200)]
Merge commit '
e605bf3b590d295f215fcc9fd58eb11be55b68cb '
* commit '
e605bf3b590d295f215fcc9fd58eb11be55b68cb ':
checkasm: remove empty array initializer list in h264pred test
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 22 Jul 2015 14:30:29 +0000 (16:30 +0200)]
Merge commit '
3ae0e721c7b6e0483801b9039b3d140e3b68b7f5 '
* commit '
3ae0e721c7b6e0483801b9039b3d140e3b68b7f5 ':
checkasm: Always link statically
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Tom Butterworth [Tue, 21 Jul 2015 00:12:12 +0000 (01:12 +0100)]
Support the Hap chunked frame format
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Vittorio Giovara [Mon, 20 Jul 2015 17:24:19 +0000 (18:24 +0100)]
mpegvideo: Add missing include
Vittorio Giovara [Mon, 20 Jul 2015 22:47:14 +0000 (23:47 +0100)]
dds: Add a rgba fate test
Michael Niedermayer [Mon, 20 Jul 2015 22:47:13 +0000 (23:47 +0100)]
dds: Fix 32bpp bitmaps decoding
Found-By: ami_stuff
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Mon, 20 Jul 2015 22:47:12 +0000 (23:47 +0100)]
dds: Fix palette decoding
Red and blue channels were decoded in the wrong order.
Found-By: ami_stuff
Vittorio Giovara [Wed, 22 Jul 2015 12:20:07 +0000 (13:20 +0100)]
dds: Fix enum declaration
Drop the global variables with anonymous enum type.
Michael Niedermayer [Wed, 22 Jul 2015 11:49:31 +0000 (13:49 +0200)]
avformat/asfdec_f: Parse ECC byte according to spec
This should not change anything as the spec requires specific values
for the fields, which where handled previously.
Ask for samples when these values do not match
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Alexandra Hájková [Tue, 21 Jul 2015 08:45:01 +0000 (10:45 +0200)]
asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alexandra Hájková [Fri, 17 Jul 2015 12:17:02 +0000 (14:17 +0200)]
asfdec: close the demuxer properly when read_header is failing
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alexandra Hájková [Tue, 21 Jul 2015 07:14:39 +0000 (09:14 +0200)]
asfdec: factor out seeking to the Data Object outside while
return INVALIDDARA if Data Object was not found
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sun, 19 Jul 2015 09:24:36 +0000 (11:24 +0200)]
qsvenc_hevc: use the correct HW plugin UID
周晓勇 [Wed, 22 Jul 2015 07:10:38 +0000 (15:10 +0800)]
avcodec: loongson optimize pixblockdsp with mmi
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Janne Grunau [Mon, 20 Jul 2015 21:17:57 +0000 (23:17 +0200)]
checkasm: remove empty array initializer list in h264pred test
Fixes MSVC compilation.
Carl Eugen Hoyos [Wed, 22 Jul 2015 08:25:10 +0000 (10:25 +0200)]
Cosmetics: Reindent after last commit.
Carl Eugen Hoyos [Wed, 22 Jul 2015 08:23:18 +0000 (10:23 +0200)]
lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input.