virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
41,098 Commits 37 Branches 400 Tags 458 MiB
c2eae4bae7
Commit Graph

41098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Nagy
c2eae4bae7 lavfi: Fill linesize, sample_rate and channel_layout fields in avfilter_fill_frame_from_audio_buffer_ref. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 22:52:23 +02:00
Clément Bœsch
d187e7616e ffmpeg: use %f instead of %lf in volume args format printf. 
%f refers to a double argument already.
 2012-05-28 22:17:05 +02:00
Michael Niedermayer
ca7fa3a516 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  AVOptions: fix the value printed in out of range error message.

Conflicts:
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 22:07:34 +02:00
Michael Niedermayer
f2bc2e8954 configure: disable avresample by default 
avresample is redundant and unneeded

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 19:43:57 +02:00
Michael Niedermayer
f0e39889ad configure: add asyncts->avresample dependancy 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 19:43:34 +02:00
Carl Eugen Hoyos
5cd947d81b Fix r10k codec for widths that are not multiples of 64. 
Fixes ticket #1358
 2012-05-28 19:05:15 +02:00
Carl Eugen Hoyos
77cea13f05 Mark avui encoder experimental. 
Some decoders require the AVID atom that we currently
do not write when encoding avui.
 2012-05-28 18:20:39 +02:00
Michael Niedermayer
b4904e804d jvdec: check videosize 
Fixes null ptr dereference
fixes Ticket1364

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 17:24:13 +02:00
Michael Niedermayer
50122084a6 motionpixels: check extradata size 
Fixes null ptr derefernce
Fixes Ticket1363

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 17:24:13 +02:00
Michael Niedermayer
849d4b0413 iff_ilbm: fix null ptr deref 
Fixes Ticket1362

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 17:24:13 +02:00
Michael Niedermayer
77a4c8b959 yop: check for missing extradata 
Fixes null ptr deref
Fixes Ticket1361

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 17:24:13 +02:00
Michael Niedermayer
01900fcc45 xan: fix out of array read 
Fixes ticket1360

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 17:24:13 +02:00
Michael Niedermayer
1e5c7376c4 cdgraphics: Fix out of array write 
Fixes Ticket1359

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 17:24:13 +02:00
Carl Eugen Hoyos
83de4f5fc9 Test extradata size before reading from extradata when decoding avui. 2012-05-28 15:58:46 +02:00
Michael Niedermayer
d5a17d7f4d configure: fix the wording for gpl incompatible licenses warnings 
calling the 4 clause BSD license non free is quite a stretch ;)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 15:49:12 +02:00
Michael Niedermayer
f997ac1c8b configure: openssl is compatible with the LGPL. 
looking at the license i cannot see why they would be incompatible and
researching this matter a bit also turned up no reasons.

If i missed something, please dont hesitate to flame me and or revert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 15:49:07 +02:00
Anton Khirnov
0426c69310 AVOptions: fix the value printed in out of range error message. 2012-05-28 12:55:41 +02:00
Michael Niedermayer
394b692b70 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avprobe: restore pseudo-INI old style format for compatibility.
  avprobe: fix formatting.
  log: make colored output more colorful.
  rtsp: Check for dynamic payload handlers if no static payload mapping was found

Conflicts:
	Changelog
	doc/ffprobe.texi
	ffprobe.c
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 00:50:23 +02:00
Michael Niedermayer
875851294f avienc: create xsub in avi files that are closer to whats in the wild 
Fixes ticket1332

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-27 22:45:52 +02:00
Michael Niedermayer
9c27f29a01 Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: force exit when filter configuration fails
  ffplay: fix stream cycling if audio decoding fails
  ffplay: flush codec buffers before freeing filters
  ffplay: dont destroy packet queues on stream change

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-27 16:04:10 +02:00
Michael Niedermayer
fcd08262fd tests and tools: cleanup ffmpeg reference 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-27 15:42:55 +02:00
Vitor Sessak
2fd5e70869 x86: use new schema for ASM macros 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-27 15:42:45 +02:00
Michael Niedermayer
65212e3ed9 mxfdec: remove unused last_index_duration 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-27 15:42:45 +02:00
Clément Bœsch
80bf2b6e84 Changelog: fix wrong/inaccurate entries. 2012-05-27 15:28:24 +02:00
Carl Eugen Hoyos
ab7d6cb8f7 Support decoding fourcc YVYU. 
Based on work by ami_stuff.

Fixes ticket #1352
 2012-05-27 01:13:37 +02:00
Clément Bœsch
5c3f79198c lavfi/deshake: add libavcodec dependency (dsputil). 2012-05-27 00:34:09 +02:00
Clément Bœsch
19c1bf1525 ffprobe: reduce the number of AVBPrint resets. 2012-05-26 22:53:13 +02:00
Michael Niedermayer
53ce990513 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  opt: Add av_opt_set_bin()
  avconv: Display the error returned by avformat_write_header
  rtpenc_chain: Return an error code instead of just a plain pointer
  rtpenc_chain: Free the URLContext on failure
  rtpenc: Expose the ssrc as an avoption
  avprobe: display the codec profile in show_stream()
  avprobe: fix function prototype
  cosmetics: Fix indentation
  avprobe: changelog entry
  avprobe: update documentation
  avprobe: provide JSON output
  avprobe: output proper INI format
  avprobe: improve formatting
  rtmp: fix url parsing
  fate: document TARGET_EXEC and its usage

Conflicts:
	doc/APIchanges
	doc/fate.texi
	doc/ffprobe.texi
	ffprobe.c
	libavformat/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 22:37:37 +02:00
Anton Khirnov
8271f55bd7 avprobe: restore pseudo-INI old style format for compatibility. 2012-05-26 21:14:35 +02:00
Anton Khirnov
d30acfa94c avprobe: fix formatting. 2012-05-26 21:14:27 +02:00
Anton Khirnov
780ff97fef log: make colored output more colorful. 
Green for verbose, cyan for debug.
 2012-05-26 21:14:17 +02:00
Michael Niedermayer
a48b890392 aacdec: fix "may be used uninitialized" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 21:03:58 +02:00
Michael Niedermayer
21e5dd93d7 aacpsy: fix "may be used uninitialized" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 20:59:57 +02:00
Martin Storsjö
6099543ad4 rtsp: Check for dynamic payload handlers if no static payload mapping was found 
Some systems abuse the static payload types 35 or 36 (which
according to IANA are unassigned) for H264.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 21:58:18 +03:00
Alexis Ballier
0bf90ceb84 Fix tests without fate samples. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 20:49:59 +02:00
Michael Niedermayer
f7c89705e4 avio: fix "discards const qualifier from pointer target type" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 20:46:02 +02:00
Michael Niedermayer
8a45e0c354 lswsutils: fix "ncompatible pointer type" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 20:46:00 +02:00
Michael Niedermayer
6d401effc4 lavfutils: fix incompatible pointer type warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 20:45:59 +02:00
Michael Niedermayer
be97675e6c af_aresample: fix pts, they where off by a packet in the -async >0 case. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 16:22:46 +02:00
Samuel Pitoiset
154486f9ad opt: Add av_opt_set_bin() 
Introduce a new function to set binary data through AVOption,
avoiding having to convert the binary data to a string inbetween.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 14:31:44 +03:00
Michael Niedermayer
aeb2dea802 Changelog, spell out the CVEs that where fixed. 
there are some holes in the list as some things have been fixed
in previous releases already.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 13:07:04 +02:00
Christian Schmidt
f7d5272456 ffprobe: display the codec profile in show_stream() 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-05-26 12:39:11 +02:00
Martin Storsjö
a1a6cdc26e avconv: Display the error returned by avformat_write_header 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 13:35:44 +03:00
Martin Storsjö
68c813081b rtpenc_chain: Return an error code instead of just a plain pointer 
Also check the return value in sapenc.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 13:35:44 +03:00
Martin Storsjö
93cef6f923 rtpenc_chain: Free the URLContext on failure 
If an URLContext is passed in, its ownership is given to this
function, and is either owned by the returned AVFormatContext
on a successful return, or freed on failure.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 13:35:44 +03:00
Martin Storsjö
2dcb21a95d rtpenc: Expose the ssrc as an avoption 
This allows the caller to set it, and allows the caller to query
what it was set to.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-05-26 13:35:39 +03:00
Stefano Sabatini
36f714f825 tests/lavfi: use do_lavfi_pixfmts for the pixdesctest test 
Simplify, and as a side effect extend the number of supported formats, in
particular add a test for pal8.
 2012-05-26 12:02:30 +02:00
Stefano Sabatini
52b23cbf1c tests/lavfi: rework lavfi-regression.sh, avoid use of ffmpeg -pix_fmts 
Use lavfi-showfiltfmts for checking the format supported by the scale
filter instead. The advantage is that the scale filter may support
formats which are not supported by libswscale (namely: the pal8 format).

The new implementation is also a bit cleaner, because it doesn't depend
on the ffmpeg output.
 2012-05-26 10:46:46 +02:00
Michael Niedermayer
72261fa867 swr: fix swr_drop_output() 
Fixes part of Ticket1341

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 02:33:38 +02:00
Michael Niedermayer
411689b5e1 af_aresample: fix request_frame() 
Fixes part of Ticket1341

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-26 02:28:40 +02:00