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

55882 Commits

Author SHA1 Message Date
Michael Niedermayer 6bba695785 Merge commit 'a90cff137b2aca89380b0acad41cd7bb05619ece' 
* commit 'a90cff137b2aca89380b0acad41cd7bb05619ece':
  electronicarts: comment wording fixes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 12:08:47 +02:00
Michael Niedermayer 6a4e55a246 Merge commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c' 
* commit '288f2ffb57ae9e9eee2748aca26da3aeb3ca6f6c':
  electronicarts: Remove bogus function documentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 12:07:49 +02:00
Michael Niedermayer a87cf3689e Merge commit '8747fce91fca6bb8e9936497f2de05c905cf43b5' 
* commit '8747fce91fca6bb8e9936497f2de05c905cf43b5':
  electronicarts: K&R formatting cosmetics

Conflicts:
	libavformat/electronicarts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 12:01:22 +02:00
Michael Niedermayer 15677e7239 Merge commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa' 
* commit 'e8c0defe1322f0ff281d9bc5eee91fa1b712b6aa':
  8bps: decode 24bit files correctly as rgb32 on bigendian

Conflicts:
	libavcodec/8bps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 11:43:26 +02:00
Kostya Shishkov f399e406af altivec: perform an explicit unaligned load 
Implicit vector loads on POWER7 hardware can use the VSX
instruction set instead of classic Altivec/VMX. Let's force
a VMX load in this case.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-16 10:08:47 +03:00
Michael Niedermayer ec0e0eb4c1 avfilter/vf_scale+aresample: minor simpification 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 04:26:59 +02:00
Michael Niedermayer 6d246f440e avfilter/vf_scale: generic swscale option support 
With this all AVOptions from swscale can be set without each needing
changes to vf_scale.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 23:23:58 +02:00
Carl Eugen Hoyos 9d86bfc259 hlsenc: Don't reset the number variable when wrapping 
The counter itself shouldn't be wrapped, since it is used for
determining end_pts for the next segment - only wrap the number
used for the segment file name.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-15 22:41:19 +03:00
Stefano Sabatini 09c93b1b95 hlsenc: Append the last incomplete segment when closing the output 
Also avoid comparing NOPTS values.

Bug-id: 551
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-15 22:41:18 +03:00
Martin Storsjö c9031c7c14 hlsenc: Add a proper dependency on the mpegts muxer 
The hls muxer itself doesn't have any direct (object file level)
dependencies on mpegtsenc.o, and including that object file
directly doesn't ensure that it is registered so that the muxer
actually is accessible.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-15 22:41:11 +03:00
Michael Niedermayer 1e0e193240 sws: add dither enum 
This allows specifying more dither algorithms without using up flags and
without ambiguities.

Also initialize the new field based on the flags and use it.
Note, improving the logic of the checks is left to subsequent
commits, this here only switches from flags to enum.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 21:39:32 +02:00
Michael Niedermayer 60e9b8556a swscale_unscaled: make dither_scale static, its not used elsewhere and has no prefix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 21:38:22 +02:00
Piotr Bandurski 165b65771d avformat/riff: add DM4V FourCC 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 15:46:25 +02:00
Diego Biurrun 239f55bf3c vp56data: Move all data tables to the .c file 2013-08-15 14:38:03 +02:00
Diego Biurrun cb214707a6 vp56data: Move all shared enum/struct declarations to common header 2013-08-15 14:38:03 +02:00
Diego Biurrun 38f64c0330 mpeg12decdata.h: Move all tables to the only place they are used 2013-08-15 14:38:03 +02:00
Diego Biurrun ec6c1b1d83 mpeg12decdata: Remove unused #define 2013-08-15 14:38:03 +02:00
Diego Biurrun c591d4575a avcodec: Replace local extern declarations for tables with header #includes 2013-08-15 14:38:03 +02:00
Diego Biurrun aa2ba8c99e swscale: Move extern declarations for tables to swscale_internal.h 
Also add missing ff_ prefixes where necessary.
 2013-08-15 14:38:03 +02:00
Diego Biurrun d258531502 swscale: Mark a bunch of tables only used within one file static 2013-08-15 14:38:03 +02:00
Diego Biurrun 060ce0c697 ivi_common: Make some tables only used within the file static 2013-08-15 14:38:03 +02:00
Martin Storsjö 4b054a3400 rtpproto: Check the right feature detection macro 
IPPROTO_IPV6 is unrelated here (it's only used in udp.c for
multicast sockopts), check for support for the sockaddr_in6
struct itself.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-15 15:35:41 +03:00
Michael Niedermayer 23606f27f0 avcodec/ffv1enc: bump minor_version for the chroma_plane fix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 13:49:21 +02:00
Michael Niedermayer 1a01147d7a avcodec/ffv1enc: fix chroma_plane for rgb/rgba 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 13:27:29 +02:00
Michael Niedermayer c387c45e83 ffv1: fix plane_count at version 1.4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 13:03:53 +02:00
Michael Niedermayer 8ec6188263 ffv1dec: support printing information about the global header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 12:58:48 +02:00
Diego Biurrun 163a729725 electronicarts: Let functions always returning the same value return void 2013-08-15 12:24:43 +02:00
Diego Biurrun 4908c8ef27 electronicarts: Improve some function/variable names 2013-08-15 12:24:42 +02:00
Diego Biurrun a90cff137b electronicarts: comment wording fixes 2013-08-15 12:24:42 +02:00
Diego Biurrun 288f2ffb57 electronicarts: Remove bogus function documentation 2013-08-15 12:24:42 +02:00
Diego Biurrun 8747fce91f electronicarts: K&R formatting cosmetics 2013-08-15 12:24:42 +02:00
Janne Grunau e8c0defe13 8bps: decode 24bit files correctly as rgb32 on bigendian 2013-08-15 11:50:43 +02:00
Michael Niedermayer 2c959eccc6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtpproto: Check for the right feature when reading a sockaddr_in6

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 11:34:30 +02:00
Dave Yeo c3386bd5b4 rtpproto: Check for the right feature when reading a sockaddr_in6 
Some systems, such as OS/2, define AF_INET6 without a full
implementation.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-15 10:31:43 +03:00
Michael Niedermayer bfbe07670b wavpackenc: simplify "sign = ((sample) < 0) ? 1 : 0;" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:20:25 +02:00
Michael Niedermayer 1a53ddd9a2 avcodec/lzwenc: change asserts to av_asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:15:54 +02:00
Michael Niedermayer 796b20fa1c avcodec/gif: use the whole allocated buffer 
Fixes some gif encoding failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:15:54 +02:00
Michael Niedermayer b4e2e03709 avcodec/lzwenc: Add 1 additional bit of padding for gif 
This fixes issues with gimp reading animated gifs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:15:54 +02:00
Michael Niedermayer 5dd5985e05 avcodec/gif: move BITSTREAM_WRITER_LE up 
This prevents issues in case any header #includes put_bits.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 23:15:54 +02:00
Alexander Strasser dc2e4c2e53 lavf/wavdec: Fix seeking in files with unaligned offsets 
A file with a prepended ID3 tag of an uneven length was found
in the wild.

Check if the wav data starts at an uneven offset and use that
information to correct the seeking calculation in wav_seek_tag,
which used to only seek to even byte positions.

Regression since ac87eaf856

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2013-08-14 22:05:41 +02:00
Michael Niedermayer dabfa80ce2 avcodec/mjpegdec: print a message when there was just a single field and no frame 
Fixes ticket1915

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 19:16:38 +02:00
Paul B Mahol 93f4277714 WavPack encoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-14 14:04:05 +00:00
Michael Niedermayer 20904518e9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  sdp: Add an option for sending RTCP packets to the source of the last packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 12:42:44 +02:00
Michael Niedermayer 2425be894a Merge commit '6b58e11a8331690ec32e9869db89ae10c54614e9' 
* commit '6b58e11a8331690ec32e9869db89ae10c54614e9':
  rtpproto: Add an option for writing return packets to the address of the last received packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 12:38:11 +02:00
Michael Niedermayer 1a01f367a4 Merge commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6' 
* commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6':
  rtpproto: Update the parameter documentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 12:30:40 +02:00
Michael Niedermayer ab06436dbf Merge commit '5268bd2900effa59b51e0fede61aacde5e2f0b95' 
* commit '5268bd2900effa59b51e0fede61aacde5e2f0b95':
  segafilm: Error out on impossible packet size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 12:25:51 +02:00
Michael Niedermayer 070c22d53a Merge commit '3562684db716d11de0b0dcc52748e9cd90d68132' 
* commit '3562684db716d11de0b0dcc52748e9cd90d68132':
  ogg: Always alloc the private context in vorbis_header

Conflicts:
	libavformat/oggparsevorbis.c

See: 18b46a494e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 12:17:02 +02:00
Michael Niedermayer 2bac839bd3 Merge commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7' 
* commit 'f13fe6020e6a3871f9b0c96b240e58e6ed4fb5d7':
  rtjpeg: Use init_get_bits8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 11:56:12 +02:00
Michael Niedermayer d12bc01ec5 Merge commit '62cc7a91080194d9ead162516f779f20931220d9' 
* commit '62cc7a91080194d9ead162516f779f20931220d9':
  rtjpeg: return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 11:51:42 +02:00
Michael Niedermayer 8da4305eb5 Merge commit '2df0776c2293efb0ac12c003843ce19332342e01' 
* commit '2df0776c2293efb0ac12c003843ce19332342e01':
  nuv: Use av_fast_realloc

Conflicts:
	libavcodec/nuv.c

This change is not merged, the long ago fixed buffer use after codec_reinit()
was a bug.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-14 11:50:40 +02:00