virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
39,200 Commits 37 Branches 400 Tags 462 MiB
a5b823368a
Commit Graph

39200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
6716e6892b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  FATE: Add ZeroCodec test
  oggparseogm: fix order of arguments of avpriv_set_pts_info().
  pngenc: better upper bound for encoded frame size.
  aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
  aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
  aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
  aiffdec: do not set bit rate if block duration is unknown
  wmall: output packet only if we have decoded some samples

Conflicts:
	libavcodec/pngenc.c
	tests/fate/lossless-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 20:59:58 +01:00
Paul B Mahol
b1a0d694ea dcaenc: switch to encode2() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 20:44:24 +01:00
Reimar Döffinger
ffa28da180 Support dropping audio dts/pts via -async -1. 
Allows working around issue #605.
Note: as a side effect this fixes that -vsync drop
as far as I could tell would not drop pts/dts values
when duplicating frames or when flushing encoder delay.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-22 20:36:16 +01:00
Ronald S. Bultje
e73c6aaabf asf: reset side data elements on packet copy. 
Prevents crash (double free) when free()ing the original packet.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Ronald S. Bultje
262196445c wmavoice: fix stack overread. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Ronald S. Bultje
3c9267673e wmalossless: error out if a subframe is not used by any channel. 
Prevents infinite loop because min_channel_len never increments.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Ronald S. Bultje
75d7975268 vqa: check palette chunk size before reading data. 
Prevents overreads beyond buffer boundaries.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Ronald S. Bultje
d462949974 wmalossless: reset sample pointer for each subframe. 
Prevents overwrites when some subframes only encode some channels.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Ronald S. Bultje
326f7a68bb wmalossless: error out on invalid values for order. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Derek Buitenhuis
e9c0b12c2e FATE: Add ZeroCodec test 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-03-22 19:52:56 +01:00
Michael Niedermayer
f0b4a505d8 oggparseogm: fix order of arguments of avpriv_set_pts_info(). 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-03-22 19:51:43 +01:00
Anton Khirnov
677df4d2ef pngenc: better upper bound for encoded frame size. 
Fixes encoding very large pictures.

Thanks to Костя for providing the formula.
 2012-03-22 19:50:35 +01:00
Michael Niedermayer
179a592094 libutvideoenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:40:58 +01:00
Michael Niedermayer
532f1c7aa7 lavc: limit realloc() on encoding to the libav compatibility API. 
Neither the old nor new need it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:40:58 +01:00
Reimar Döffinger
0f95270afe VC1: Fix skiploopfilter=all. 
It is currently only handled in the parser code for WMV/ASF style
header, but not the one used in the bytestream format used when
muxed into MPEG-TS as on e.g. BluRay.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-22 19:41:09 +01:00
ami_stuff
f6b7863808 Replace SSE2 instruction in scalarproduct_float_sse() by SSE equivalent. 
Fixes an AAC decoding issue with the sample from ticket #213 on machines
with SSE but without SSE2.
Based on 89411a by Reimar.
 2012-03-22 19:28:52 +01:00
Michael Niedermayer
740b9ff44e lavc: Redesign the internal encoding API. 
The new API allows (optionally and on by default) using a internal buffer to encode, avoiding
the need to allocate large buffers or risking failure on too small buffers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:48 +01:00
Michael Niedermayer
dca0e4cd61 avcodec_encode_audio2: use ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:23 +01:00
Michael Niedermayer
2bd303f95c zmbvenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:23 +01:00
Michael Niedermayer
ae7f0d0a4f yuv4enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:23 +01:00
Michael Niedermayer
7959eb0d12 y41penc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
a3f36b09e7 xwdenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
5d8a20a1c5 xbmenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
6cb29a1ab0 wmaenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
2ed79755d7 vorbisenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
079d7246fb v410enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
efc245b9d6 v408enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
f234b02c94 v308enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
e252fb822a v210enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
219d8245a0 tiffenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
ea8fc91886 tiffenc: fix return value. 2012-03-22 19:03:22 +01:00
Michael Niedermayer
c038fb411b targaenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
dbb11e7db3 svq1enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
2ea893fa23 sunrastenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
b911d7dc60 sgienc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
c32438c42a r210enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
78365b414b qtrleenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
37e434e492 proresenc_kostya: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
d388dd9ee3 proresenc_anatoliy: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
6a74c48cf9 pnmenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
5c6c62543c pngenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
d2c4b3754d pcxenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
11e8f3e7a2 pcm: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
29971e4f9c pamenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
93aafe2a39 nellymoserenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
6e3aee03b8 msvideo1enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
3998b13a34 mpegaudioenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
a895669f53 ljpegenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
fcd8a3c8c2 libxvidff: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
d29719121d libxavs: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00