videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-13 10:39:08 +02:00
Code Releases Activity
73,952 Commits 36 Branches 398 Tags 244 MiB
9c31b39641
Commit Graph

73952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Michael Niedermayer
b68e445f9b Merge commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221' 
* commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221':
  dds: Fix 32bpp bitmaps decoding

Conflicts:
	libavcodec/dds.c

See: 5c583b1419
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 17:30:22 +02:00
Michael Niedermayer
05cf687d13 Merge commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c' 
* commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c':
  dds: Fix palette decoding

Conflicts:
	libavcodec/dds.c

See: 36a87c2dc7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 17:26:37 +02:00
Michael Niedermayer
eaf15bba03 Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4' 
* commit 'ea4d46e72945cba37feb7aa154eb970732f513e4':
  dds: Fix enum declaration

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 17:14:24 +02:00
Michael Niedermayer
6b9be608ce 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>
 2015-07-22 17:13:18 +02:00
Michael Niedermayer
fa7defc89a Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd' 
* commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd':
  asfdec: close the demuxer properly when read_header is failing

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 17:06:22 +02:00
Michael Niedermayer
fce350be0e Merge commit '5655236a67203d923755f285584c6e68abe7e33f' 
* commit '5655236a67203d923755f285584c6e68abe7e33f':
  asfdec: factor out seeking to the Data Object outside while

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 16:53:26 +02:00
Michael Niedermayer
fbdbe7a5d2 Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c' 
* commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c':
  qsvenc_hevc: use the correct HW plugin UID

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 16:46:25 +02:00
Michael Niedermayer
e1b5a2e46e Merge commit 'e605bf3b590d295f215fcc9fd58eb11be55b68cb' 
* commit 'e605bf3b590d295f215fcc9fd58eb11be55b68cb':
  checkasm: remove empty array initializer list in h264pred test

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 16:38:16 +02:00
Michael Niedermayer
c1692439e0 Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5' 
* commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5':
  checkasm: Always link statically

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 16:30:37 +02:00
Tom Butterworth
c7e6443441 Support the Hap chunked frame format 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 16:15:53 +02:00
Vittorio Giovara
21c90d86d2 mpegvideo: Add missing include 2015-07-22 13:35:44 +01:00
Vittorio Giovara
a16854892c dds: Add a rgba fate test 2015-07-22 13:35:44 +01:00
Michael Niedermayer
d08d8b61aa dds: Fix 32bpp bitmaps decoding 
Found-By: ami_stuff
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-22 13:35:44 +01:00
Vittorio Giovara
57214b2f7f dds: Fix palette decoding 
Red and blue channels were decoded in the wrong order.

Found-By: ami_stuff
 2015-07-22 13:35:44 +01:00
Vittorio Giovara
ea4d46e729 dds: Fix enum declaration 
Drop the global variables with anonymous enum type.
 2015-07-22 13:35:43 +01:00
Michael Niedermayer
9837d3b068 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>
 2015-07-22 14:11:48 +02:00
Alexandra Hájková
2a187a074a asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-22 12:11:46 +02:00
Alexandra Hájková
93f16f338f asfdec: close the demuxer properly when read_header is failing 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-22 12:11:46 +02:00
Alexandra Hájková
5655236a67 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>
 2015-07-22 12:11:46 +02:00
Anton Khirnov
ecee1148af qsvenc_hevc: use the correct HW plugin UID 2015-07-22 12:11:46 +02:00
周晓勇
3e35f8efa1 avcodec: loongson optimize pixblockdsp with mmi 
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 12:11:31 +02:00
Janne Grunau
e605bf3b59 checkasm: remove empty array initializer list in h264pred test 
Fixes MSVC compilation.
 2015-07-22 12:06:32 +02:00
Carl Eugen Hoyos
6b2bb3d231 Cosmetics: Reindent after last commit. 2015-07-22 10:25:10 +02:00
Carl Eugen Hoyos
35b33f1a19 lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input. 2015-07-22 10:23:18 +02:00