virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
39,054 Commits 37 Branches 400 Tags 460 MiB
00663de3b7
Commit Graph

39054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
00663de3b7 lavc: add ff_alloc_packet2(). 
This contains a AVCodecContext thus allowing us to prevent the
error message duplication

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
6c9db40205 avcodec_encode_audio2: add missing padding to realloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:17 +01:00
Nicolas George
afbf9ed0d2 udp: lock all operations on shared variables. 2012-03-22 17:36:23 +01:00
Nicolas George
e1838835aa udp: return the error code instead of generic EIO. 2012-03-22 17:36:23 +01:00
Nicolas George
5deb5ccbbb udp: call av_fifo_space directly as needed. 
The comment seemed to indicate that left was used
to limit the size of the recv, but it was not so.
 2012-03-22 17:36:23 +01:00
Nicolas George
63afc4f638 udp: use non-blocking read instead of select. 2012-03-22 17:36:23 +01:00
Nicolas George
aa1297882f udp: use pthread_cancel instead of a shared flag. 
It allows to exit the thread immediately instead of waiting
for select to timeout (one second in the current code).
 2012-03-22 17:36:23 +01:00
Paul B Mahol
4246032216 segment: fix null pointer dereference 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:43:26 +01:00
Paul B Mahol
f1c69546c0 dvbsub: remove unused variable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:41:48 +01:00
Paul B Mahol
53c896770c bbox: remove superfluous initializations 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:40:37 +01:00
Paul B Mahol
8678af542c flicvideo: remove dead store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:24:36 +01:00
Paul B Mahol
f2b91bd63a latm_parser: remove dead store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:23:08 +01:00
Paul B Mahol
f5463d5347 sunrastenc: remove dead store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:21:30 +01:00
Paul B Mahol
ddbd0cedb0 mjpegbdec: remove dead store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:19:42 +01:00
Paul B Mahol
36440982a0 vqavideo: remove some superfluous " VQA video: " 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:16:24 +01:00
Paul B Mahol
015fd02bab electronicarts vp6: set duration of video stream 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:15:17 +01:00
Michael Niedermayer
eb9841297a doc/examples/decoding_encoding: make the buffer bigger. 
This should be converted to the new API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 05:25:26 +01:00
Michael Niedermayer
109650b34b Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: use frame count based queueing for audio queue
  ffplay: reset audio_pkt_temp when opening audio

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 05:24:54 +01:00
Michael Niedermayer
967facb695 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (26 commits)
  adxenc: use AVCodec.encode2()
  adxenc: Use the AVFrame in ADXContext for coded_frame
  indeo4: fix out-of-bounds function call.
  configure: Restructure help output.
  configure: Internal-only components should not be command-line selectable.
  vorbisenc: use AVCodec.encode2()
  libvorbis: use AVCodec.encode2()
  libopencore-amrnbenc: use AVCodec.encode2()
  ra144enc: use AVCodec.encode2()
  nellymoserenc: use AVCodec.encode2()
  roqaudioenc: use AVCodec.encode2()
  libspeex: use AVCodec.encode2()
  libvo_amrwbenc: use AVCodec.encode2()
  libvo_aacenc: use AVCodec.encode2()
  wmaenc: use AVCodec.encode2()
  mpegaudioenc: use AVCodec.encode2()
  libmp3lame: use AVCodec.encode2()
  libgsmenc: use AVCodec.encode2()
  libfaac: use AVCodec.encode2()
  g726enc: use AVCodec.encode2()
  ...

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/ac3enc.c
	libavcodec/adxenc.c
	libavcodec/libgsm.c
	libavcodec/libvorbis.c
	libavcodec/vorbisenc.c
	libavcodec/wmaenc.c
	tests/ref/acodec/g722
	tests/ref/lavf/asf
	tests/ref/lavf/ffm
	tests/ref/lavf/mkv
	tests/ref/lavf/mpg
	tests/ref/lavf/rm
	tests/ref/lavf/ts
	tests/ref/seek/lavf_asf
	tests/ref/seek/lavf_ffm
	tests/ref/seek/lavf_mkv
	tests/ref/seek/lavf_mpg
	tests/ref/seek/lavf_rm
	tests/ref/seek/lavf_ts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 00:40:11 +01:00
Michael Niedermayer
f1fdd208cc h264_mp4toannexb_bsf: use i instead of misusing unit_type. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 22:33:28 +01:00
Vidar Madsen
17431f4a4e Fix type and codetype fields in the MMF header for some phones. 2012-03-21 22:19:23 +01:00
Carl Eugen Hoyos
d3640096aa Fix libspeex decoding. 
This parly reverts 85469f.
Fixes ticket #1091.
 2012-03-21 22:19:23 +01:00
gs_gail
361c4cdca9 h264_mp4toannexb_bsf: support 24bit lengths 2012-03-21 21:42:44 +01:00
Reimar Döffinger
2a4f1d38d9 Print a warning when using wild guesses as time stamps. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-21 20:15:31 +01:00
Reimar Döffinger
89411ae699 Replace SSE2 instruction by SSE equivalent. 
This is even potentially faster in this use-case.
Should fix AAC SBR decoding on machines with SSE but not
SSE2, fixing track issue #1041.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-21 20:14:50 +01:00
Justin Ruggles
6aba117f12 adxenc: use AVCodec.encode2() 2012-03-21 15:04:42 -04:00
Justin Ruggles
54e6cf8a94 adxenc: Use the AVFrame in ADXContext for coded_frame 2012-03-21 15:04:42 -04:00
Nicolas George
38c3b68e3a pixdesc: put components always in the same order. 2012-03-21 19:01:39 +01:00
Ronald S. Bultje
68fd077f68 indeo4: fix out-of-bounds function call. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2012-03-21 19:01:08 +01:00
Diego Biurrun
3b327a4b42 configure: Restructure help output. 
Break some of the longer sections into smaller sensible pieces;
make some option descriptions and option ordering more consistent.
 2012-03-21 18:14:22 +01:00
Diego Biurrun
478fd534af configure: Internal-only components should not be command-line selectable. 2012-03-21 18:14:21 +01:00
Paul B Mahol
5ca595facb westwood_vqa: set video stream duration 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 18:09:27 +01:00
Paul B Mahol
98ca4d217d westwood_vqa: fix SND0 chunk handling 
Version from vqa header does not dictate which sound chunks may
appear in file.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 18:09:26 +01:00
Tomas Härdin
8d393ce330 aiffdec: Fix SIGFPE on pcm_f32be 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 18:09:26 +01:00
Justin Ruggles
5d4017b8f3 vorbisenc: use AVCodec.encode2() 2012-03-21 12:49:36 -04:00
Justin Ruggles
e5aab2d7a4 libvorbis: use AVCodec.encode2() 2012-03-21 12:49:36 -04:00
Justin Ruggles
8ccf545b95 libopencore-amrnbenc: use AVCodec.encode2() 2012-03-21 12:49:36 -04:00
Justin Ruggles
330d9d1b50 ra144enc: use AVCodec.encode2() 2012-03-21 12:49:36 -04:00
Justin Ruggles
f090428234 nellymoserenc: use AVCodec.encode2() 2012-03-21 12:49:35 -04:00
Justin Ruggles
32173df3d2 roqaudioenc: use AVCodec.encode2() 
The first frame pts must be saved until we have 8 frames since RoQ audio
requires 8 frames in the first packet.
 2012-03-21 12:49:35 -04:00
Justin Ruggles
b03dcf07f6 libspeex: use AVCodec.encode2() 2012-03-21 12:49:35 -04:00
Justin Ruggles
57a52f258e libvo_amrwbenc: use AVCodec.encode2() 2012-03-21 12:49:35 -04:00
Justin Ruggles
db440fa12d libvo_aacenc: use AVCodec.encode2() 2012-03-21 12:49:35 -04:00
Justin Ruggles
27bacfeb57 wmaenc: use AVCodec.encode2() 2012-03-21 12:49:32 -04:00
Nicolas George
3493390d47 lavfi: add tile video filter. 2012-03-21 15:52:45 +01:00
Nicolas George
7084985173 vsrc_color: port to new drawutils API. 2012-03-21 15:52:45 +01:00
Nicolas George
53b7a3fe08 vf_pad: port to new drawutils API. 2012-03-21 15:52:45 +01:00
Nicolas George
8ec0832743 drawutils: new API. 
This new API stores useful data in a dedicated structure
and has clearly delimited init functions.

Hopefully, uses of the old API can be replaced quickly.
 2012-03-21 15:52:45 +01:00
Michael Niedermayer
87a72b9122 swscale: Merge a hunk from qatar that seems to have been forgotten or lost. 
Author of the code from qatar is Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 15:30:52 +01:00
Stefano Sabatini
8e0d3c0369 lavfi/ass: add dar option 
Allow to specify the display aspect ratio adopted for rendering
subtitles.
 2012-03-21 15:14:28 +01:00