RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
73,349 Commits 36 Branches 392 Tags 313 MiB
Commit Graph

73349 Commits

Author SHA1 Message Date
Reynaldo H. Verdejo Pinochet 469c335c55 ffserver: unify comment formating & drop unneeded braces 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-06-24 19:17:51 -03:00
Reynaldo H. Verdejo Pinochet 1714fe2990 ffserver: factor out stream params printing 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-06-24 19:17:51 -03:00
Reynaldo H. Verdejo Pinochet 89234deaa2 ffserver: simplify URLContext cleanup 
Drop unneeded var and avoid checking for NULL twice as
ffurl_closep() already does this.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-06-24 19:17:51 -03:00
James Zern 766a8346cf libvpxdec: report colorspace 
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
 2015-06-24 15:09:31 -07:00
James Zern 469398f8b7 libvpxdec: report profile for vp9 
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
 2015-06-24 14:54:54 -07:00
Michael Niedermayer eb823df817 Merge commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d' 
* commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d':
  TextureDSP: fix erroneous condition which produced blocky output for DXT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 21:06:58 +02:00
Michael Niedermayer 87544ce8dc Merge commit '4d55484391112a30d16812597b9ad81605af0c24' 
* commit '4d55484391112a30d16812597b9ad81605af0c24':
  dds: Fix palette mode on big endian

Conflicts:
	libavcodec/dds.c

See: 21d2e3d602
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 20:57:45 +02:00
Michael Niedermayer 4107092349 Merge commit 'ded5957d75def70d2f1fc1c1eae079230004974b' 
* commit 'ded5957d75def70d2f1fc1c1eae079230004974b':
  segafilm: Remove deplanarization hack

Conflicts:
	libavformat/segafilm.c
	libavformat/version.h

See: 42b8f5fba1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 20:51:22 +02:00
Michael Niedermayer ffd9d60201 avcodec: Add codec_desc and remapping for AV_CODEC_ID_PCM_S16BE_PLANAR_DEPRECATED 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 20:37:02 +02:00
Michael Niedermayer 8e2fcd1cb4 Merge commit '5a79bf0284a37855636390e620d189a964214c9e' 
* commit '5a79bf0284a37855636390e620d189a964214c9e':
  PCM signed 16-bit big-endian planar decoder

Conflicts:
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/pcm.c
	libavcodec/version.h
	libavformat/nut.c

See: 9ba41ae63e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 20:36:26 +02:00
James Almer 58d7dde081 brstm: fix use of uninitialized variables 
Fixes valgrind complaining about "Conditional jump or move depends on uninitialised value(s)"

Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-24 14:31:54 -03:00
Michael Niedermayer d7e224ec24 avcodec/jpeg2000: change flags array type to 16bit 
reduce memory needed for flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 17:46:37 +02:00
Michael Niedermayer d580255571 vcodec/jpeg2000: Increase cblk size limit to 128 
Fixes Ticket4649

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 17:38:05 +02:00
Michael Niedermayer ffa1de8a3b avcodec/jpeg2000dec: Use 32x32->64bit for 9/7i dequantization 
Like the 5/3 case this is needed to avoid overflows and similarly for 16bpp
output pure 32bit operations are insufficient if high quality is wanted

Note, this code-path is only used in bitexact mode, so this should not
affect the speed of any real use-case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 17:09:21 +02:00
Michael Niedermayer 05ef6324d1 avcodec/jpeg2000dec: Add 5/3 de-quantization special case for the lossless case 
This avoids a multiplication and 64bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 17:05:42 +02:00
Michael Niedermayer 8ff09e9098 avcodec/jpeg2000dec: Use 32x32->64bit for 5/3 dequantization 
This fixes overflows, using fewer bits would impact high bit depth quality

Fixes Ticket4654

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 17:03:38 +02:00
Paul B Mahol 5a1f785249 avfilter: add ssim filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-24 14:04:40 +00:00
Tom Butterworth 5dbd491eb3 TextureDSP: fix erroneous condition which produced blocky output for DXT 2015-06-24 14:45:23 +01:00
Luca Barbato 4d55484391 dds: Fix palette mode on big endian 
Found-By: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-06-24 14:45:16 +01:00
Paul B Mahol ded5957d75 segafilm: Remove deplanarization hack 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-06-24 14:45:09 +01:00
Paul B Mahol 5a79bf0284 PCM signed 16-bit big-endian planar decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-06-24 14:45:00 +01:00
Mariusz Szczepańczyk 346624be4a lavf: set is_connected flag so url can be properly closed 
Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 15:40:03 +02:00
Michael Niedermayer 8f0f678f09 ffmpeg: Do not use the data/size of a bitstream filter after failure 
Found-by: Rodger Combs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 13:50:02 +02:00
Michael Niedermayer 49038fc17d Merge commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1' 
* commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1':
  libvpx: fix test for VPX_IMAGE_ABI_VERSION

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 12:39:21 +02:00
Michael Niedermayer 7e63a622d1 Merge commit 'a88e21f5b78ef5e75b073ecbfd4e92921002a703' 
* commit 'a88e21f5b78ef5e75b073ecbfd4e92921002a703':
  Fix missing symbols when libvpx has only vp8 enabled

Not merged, the FFmpeg libvpx-vp8 encoder does not use anything from libvpx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 12:38:40 +02:00
Michael Niedermayer 8f454c3154 Merge commit 'c2de2cf0d2927f3f584dab6d54276fbda92a0a71' 
* commit 'c2de2cf0d2927f3f584dab6d54276fbda92a0a71':
  arm64: constify src in h264qpel dsp function definitions

See: e16b7338d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 11:59:02 +02:00
Janne Grunau 41740ef8be libvpx: fix test for VPX_IMAGE_ABI_VERSION 2015-06-24 08:48:52 +02:00
Mark Webster a88e21f5b7 Fix missing symbols when libvpx has only vp8 enabled 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2015-06-24 08:47:30 +02:00
Janne Grunau c2de2cf0d2 arm64: constify src in h264qpel dsp function definitions 2015-06-24 08:41:32 +02:00
Michael Niedermayer 041aa800f2 avformat/mp3dec: Remove the ID3v1 tag removial code 
The code is simply broken, the read packets are not aligned to
the mp3 frames, the file end or the id3 tag thus this simply
cannot reliably find the ID3v1 tag to remove it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 02:52:11 +02:00
Michael Niedermayer 89a420b71b avcodec/mpegaudio_parser: Discard ID3v1 tag at the end 
Ideally this should be discarded by the demuxer but this is not
possible without fully parsing which would be then very similar
to this. The current ID3v1 discard code in the demuxer does not work
and will be removed in a subsequent commit

The discard code could be adjusted if needed to also discard tags at
other locations than the end or to limit this possibly to input
from the mp3 demuxer or even to move the discarding to the
decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 02:48:37 +02:00
Mariusz Szczepańczyk b23d2bac0d lavf/libssh: implement move and delete callbacks 
Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 00:44:09 +02:00
Mariusz Szczepańczyk 0cce94fb10 lavf/libssh: read empty path from url as / 
Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 00:43:17 +02:00
Lukasz Marek e96f0a692b lavf/libssh: implement directory listing callbacks 
Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 00:42:55 +02:00
Mariusz Szczepańczyk 71034163ac lavf/libsmbclient: implement move and delete callbacks 
Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-24 00:25:24 +02:00
Rodger Combs 94a43dcff1 lavf/brstm: add FATE tests for BFSTM and BCSTM files 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-23 19:44:19 +02:00
Michael Niedermayer 0416b5e033 avcodec/jpeg2000dwt: Replace /2 by >>1 
Divisions can be slow if the compiler fails to replace them by shifts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-23 18:59:00 +02:00
James Almer e22edbfd41 swscale/x86/rgb2rgb_template: fix signedness of v in shuffle_bytes_2103_{mmx,mmxext} 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-23 13:28:09 -03:00
James Almer 0c15f2f158 swscale/x86/rgb2rgb_template: don't call emms on sse2/avx functions 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-23 13:28:03 -03:00
James Almer 910eeab480 swscale/x86/rgb2rgb_template: add missing xmm clobbers 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-23 13:27:56 -03:00
Michael Niedermayer 9f997acdd0 avcodec/texturedspenc: Add () to protect macro / argument evaluation order 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-23 17:12:00 +02:00
Gwenole Beauchesne 88325c2e0b vaapi_h264: fix RefPicList[] field flags. 
Use new H264Ref.reference field to track field picture flags. The
H264Picture.reference flag in DPB is now irrelevant here.

This is a regression from git commit d8151a7, and that affected
multiple interlaced video streams.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
 2015-06-23 13:31:54 +02:00
Sebastien Zwickert c06fdacc3d vda: unlock the pixel buffer base address. 
The pixel buffer base address is never unlocked this causes
a bug with some pixel format types that are produced natively
by the hardware decoder: the first buffer was always used.
Unlock the pixel buffer base address fixes the issue.
 2015-06-23 09:20:18 +02:00
Niklesh 813b2f0da3 movtextdec.c: Improve upon dynarrays and text_to_ass 
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
 2015-06-22 22:19:35 -07:00
Michael Niedermayer 7604358018 swscale/rgb2rgb_template: Fix signedness of v in shuffle_bytes_2103_c() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-23 05:09:11 +02:00
Michael Niedermayer abb833c568 swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix shuffle_bytes_2103_c on BE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-23 05:09:06 +02:00
Michael Niedermayer 7a4b8817fe avcodec/texturedsp: Add protective () to RGBA() macro 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-23 04:19:05 +02:00
Michael Niedermayer b64e70436e avformat/mpegts: Use STREAM_TYPE_PRIVATE_DATA instead of 6 
Suggested-by: Wolfgang Lorenz <wl-chmw@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-23 03:42:12 +02:00
Stephan Vedder b368428fc0 avformat/electronicarts: Fixed ea_probe function to accept vp6a videos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-23 03:34:33 +02:00
Michael Niedermayer 8575d960fe tests/fate/image: also run fate-sgi for the fate-image target 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-23 01:46:13 +02:00