ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-27 00:30:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,390 Commits 37 Branches 398 Tags 548 MiB
c09abba1d9
Commit Graph

33390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
ef74ab20c2 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (34 commits)
  dpcm: return error if packet is too small
  dpcm: use smaller data types for static tables
  dpcm: use sol_table_16 directly instead of through the DPCMContext.
  dpcm: replace short with int16_t
  dpcm: check to make sure channels is 1 or 2.
  dpcm: misc pretty-printing
  dpcm: remove unnecessary variable by using bytestream functions.
  dpcm: move codec-specific variable declarations to their corresponding decoding blocks.
  dpcm: consistently use the variable name 'n' for the next input byte.
  dpcm: output AV_SAMPLE_FMT_U8 for Sol DPCM subcodecs 1 and 2.
  dpcm: calculate and check actual output data size prior to decoding.
  dpcm: factor out the stereo flag calculation
  dpcm: cosmetics: rename channel_number to ch
  avserver: Fix a bug where the socket is IPv4, but IPv6 is autoselected for the loopback address.
  lavf: Avoid using av_malloc(0) in av_dump_format
  dxva2_h264: pass the correct 8x8 scaling lists
  dca: NEON optimised high freq VQ decoding
  avcodec: reject audio packets with NULL data and non-zero size
  dxva: Add ability to enable workaround for older ATI cards
  latmenc: Set latmBufferFullness to largest value to indicate it is not used
  ...

Conflicts:
	libavcodec/dxva2_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:54:46 +02:00
Laurent Aimar
5ca5d432e0 Fix out of bound reads/writes in the TIFF decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:41:40 +02:00
Laurent Aimar
4a7876c6e4 Check for out of bound writes in the QDM2 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:41:40 +02:00
Laurent Aimar
491eaf35ae Fix out of bound reads in the QDM2 decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:41:40 +02:00
Laurent Aimar
346876ec16 Fix out of bound reads due to integer overflow in the ADPCM IMA Electronic Arts EACS decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:41:40 +02:00
Laurent Aimar
a5d46235f3 Check for out of bound reads in the Electronic Arts CMV decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:41:40 +02:00
Laurent Aimar
113d7be624 Prevent NULL dereferences when missing the reference frame in the Electronic Arts CMV decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:41:40 +02:00
Laurent Aimar
e9064c9ce8 Fix potential pointer arithmetic overflows in the Electronic Arts CMV decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:41:39 +02:00
Laurent Aimar
39993860e1 Prevent infinite loop in the ANM decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:41:39 +02:00
Laurent Aimar
d39d7122e3 Fix double free on error in Deluxe Paint Animation demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:41:39 +02:00
Laurent Aimar
7afe9e5638 Check for out of bound reads in AVS decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:41:39 +02:00
Laurent Aimar
5d44c061cf Check for out of bound writes in the avs demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:41:39 +02:00
Laurent Aimar
1cce7def0a Check for corrupted data in avs demuxer. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 02:41:39 +02:00
Michael Niedermayer
834b3760a7 swresample: check for invalid sample formats. 
Bug-Found-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 01:39:17 +02:00
Michael Niedermayer
2a93f28a4b avformat_free_context: favor av_freep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 01:29:30 +02:00
Michael Niedermayer
3b6c0ba382 oggenc: favor av_freep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 01:26:55 +02:00
Michael Niedermayer
17d51938d2 swr_test: test planar audio 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 01:17:39 +02:00
Michael Niedermayer
a75b254c74 swr: minor fixes to get planar audio working 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 01:17:39 +02:00
Michael Niedermayer
7322483d72 mpegvideo: increase emu edge buffer size 
This fixes a crash with 422 H.264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-01 01:16:25 +02:00
Justin Ruggles
08bd22a61b dpcm: return error if packet is too small 2011-09-30 18:15:53 -04:00
Justin Ruggles
0354fb7ebe dpcm: use smaller data types for static tables 2011-09-30 18:15:53 -04:00
Justin Ruggles
5a54d51017 dpcm: use sol_table_16 directly instead of through the DPCMContext. 2011-09-30 18:15:53 -04:00
Justin Ruggles
f47f7efd14 dpcm: replace short with int16_t 2011-09-30 18:15:53 -04:00
Justin Ruggles
8d77d12a2b dpcm: check to make sure channels is 1 or 2. 2011-09-30 18:15:53 -04:00
Justin Ruggles
4bad464e7f dpcm: misc pretty-printing 2011-09-30 18:15:53 -04:00
Justin Ruggles
1de8401c56 dpcm: remove unnecessary variable by using bytestream functions. 
Uses 'buf' directly instead of a separate iterator variable 'in'.
 2011-09-30 18:15:53 -04:00
Justin Ruggles
fc6faee0d1 dpcm: move codec-specific variable declarations to their corresponding decoding blocks. 2011-09-30 18:15:53 -04:00
Justin Ruggles
989bb7bd04 dpcm: consistently use the variable name 'n' for the next input byte. 2011-09-30 18:15:52 -04:00
Justin Ruggles
04b24cf94b dpcm: output AV_SAMPLE_FMT_U8 for Sol DPCM subcodecs 1 and 2. 
Uses the native sample format for the codec instead of left-shifting all
samples by 8.
 2011-09-30 18:15:52 -04:00
Justin Ruggles
76db17dc7d dpcm: calculate and check actual output data size prior to decoding. 2011-09-30 18:15:52 -04:00
Justin Ruggles
3db8db406f dpcm: factor out the stereo flag calculation 2011-09-30 18:15:52 -04:00
Justin Ruggles
b09c7eefb7 dpcm: cosmetics: rename channel_number to ch 
Make the code easier to read.
 2011-09-30 18:15:52 -04:00
Reimar Döffinger
812010c17e Remove unused variable. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2011-09-30 23:33:43 +02:00
Nathan Caldwell
f5e717f3c7 avserver: Fix a bug where the socket is IPv4, but IPv6 is autoselected for the loopback address. 
This fixes bind(8080): Address family not supported by protocol.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-30 21:33:52 +02:00
Martin Storsjö
e81e5e8ad2 lavf: Avoid using av_malloc(0) in av_dump_format 
On OS X, av_malloc(0) returns pointers that cause crashes when
freed.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-09-30 22:31:30 +03:00
Carl Eugen Hoyos
bcb1555489 dxva2_h264: pass the correct 8x8 scaling lists 
Copy the Inter 8x8 scaling list as second 8x8 matrix into DXVA2's
quantization matrix data structure instead of a potentially unset
Intra chroma scaling matrix.

Fix dxva2 decoding for some H264 samples.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-09-30 20:15:17 +02:00
Alex Converse
3b0e242825 lavf/utils: Drop old hack for implicit HE-AAC signaling. 
It has not been needed since a58858d60d.

Fixes decode of implicit HE-AAC without extradata or ADTS headers.
 2011-09-30 20:08:10 +02:00
Mans Rullgard
bf5d46d8e6 dca: NEON optimised high freq VQ decoding 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-09-30 19:01:23 +01:00
Michael Niedermayer
53d5c463b2 doc: add swresample doc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-30 18:10:28 +02:00
Michael Niedermayer
78972a69e3 lavf/utils: ignore subtitle timestamps in timings calculation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-30 17:17:22 +02:00
Justin Ruggles
6326afd5e9 avcodec: reject audio packets with NULL data and non-zero size 
There is no valid reason the user should ever send such packets in the
first place, but the documentation for CODEC_CAP_DELAY states that the
codec is guaranteed not to get a NULL packet unless that capability is
set. That isn't true without preventing this case.
 2011-09-30 11:02:50 -04:00
Maksym Veremeyenko
dacf076614 fix memory leak in oggenc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-30 16:27:54 +02:00
Jean First
f65c6f751f Enable multithreding when decoding with libopenjpeg 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-30 15:40:56 +02:00
Jean First
125ea3ee06 Warn the user if lowres > max_lowres, set lowres to max_lowres and continue 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-30 15:30:35 +02:00
Joakim Plate
dcce09d64b dxva: Add ability to enable workaround for older ATI cards 
The workaround needs to be enabled per PCI ID which cannot be detected inside
libavcodec. So add a flag to manually enable the alternate behavior.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-09-30 11:17:53 +02:00
Kieran Kunhya
d4a544cbc4 latmenc: Set latmBufferFullness to largest value to indicate it is not used 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-09-30 11:17:27 +02:00
Laurent Aimar
f42b3195d3 Fix out of bound writes in fix_bitshift() of the shorten decoder. 
The data pointers s->decoded[*] already take into account s->nwrap.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-30 04:14:23 +02:00
Michael Niedermayer
c329972687 g729: dont force all cpu optims to off but override just the one that doesnt work. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-30 03:02:02 +02:00
Michael Niedermayer
8045af65d4 ppc: fix usage of dsp_mask 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-30 02:43:20 +02:00
Michael Niedermayer
30ba924bc8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dca: clear inactive subbands only once in qmf_32_subbands()
  vf_unsharp: set default chroma size value to 5x5
  vf_unsharp: fix out-of-buffer read

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-30 02:19:36 +02:00