virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Code Issues Releases Activity
32,131 Commits 37 Branches 400 Tags 460 MiB
b118255e91
Commit Graph

32131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Converse
d8b999e2d0 mpegts: log into an AVFormatContext rather than MpegTSContext. 
MpegTSContext's AVClass member can be NULL.
 2011-08-16 11:09:39 -07:00
Stefano Sabatini
86ca51acb0 af_format: prefer strtok_r() over strsep() 
strsep() is not POSIX compliant, and thus not supported on some platform.
Fix compilation on Solaris.
 2011-08-16 17:00:57 +02:00
Stefano Sabatini
a719679561 lavfi: complain and exit for invalid named values in ff_parse_packing_format() 2011-08-16 17:00:49 +02:00
Michael Niedermayer
47219e1c0c avconv: fix uninitialized variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-16 12:18:37 +02:00
Anton Khirnov
eb97dbb05a movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings 2011-08-16 10:34:17 +02:00
Anton Khirnov
2c81d5f4c5 avconv: remove a write-only variable 2011-08-16 06:24:01 +02:00
Anton Khirnov
40fc281087 avconv: remove pointless parameter from new_*_stream(). 
New streams are always added to the last output file.
 2011-08-16 06:23:46 +02:00
Anton Khirnov
169f0647b7 avconv: cosmetics, move code 
Move find_codec_or_die(), choose_codec(), new_output_stream() and
read_avserver_streams() below transcode() where they belong.
 2011-08-16 06:23:27 +02:00
Anton Khirnov
86530f418e avconv: cosmetics -- move copy_chapters(). 
It's only used in opt_output_file(), so move it right above
opt_output_file().
 2011-08-16 06:21:32 +02:00
Anton Khirnov
f233cfed7b avconv: cosmetics -- move parse_forced_key_frames(). 
parse_forced_key_frames() is only used in new_video_stream(), so move it
right above new_video_stream().
 2011-08-16 06:21:25 +02:00
Anton Khirnov
64db1a82d6 lavc: add audio flag to the 'b' option, deprecate 'ab'. 
Its only reason for its existence was ffmpeg's inability to properly assign
AVOptions to streams. Now this is not a problem anymore, so 'ab' should
go.
 2011-08-16 06:20:43 +02:00
Anton Khirnov
f4ad238c6c avconv: rename sameq to same_quant 
It's often mistakenly used as 'same quality', emphasize that it's not
true in the manual.
 2011-08-16 06:19:08 +02:00
Anton Khirnov
7478ab5a13 doc/avconv: add forgotten end of chapter. 2011-08-16 06:18:59 +02:00
Anton Khirnov
320d769389 Changelog: document avconv incompatibilities with ffmpeg. 2011-08-16 06:18:38 +02:00
Anton Khirnov
92f1940e99 avconv: replace -vcodec/-acodec/-scodec with a better system. 
The new option doesn't depend on its placement wrt -new* options (which
don't exist anymore) and works in a similar way as per-stream AVOptions.

-[vas]codec remain as aliases to -codec:[vas]
 2011-08-16 06:17:02 +02:00
Anton Khirnov
ff884c79ee avconv: remove presets. 
Nothing except x264 uses them and native x264 presets should be used
with private options.
 2011-08-16 06:10:20 +02:00
Michael Niedermayer
091a24b75f fate: more cases of avconv that should be conditional 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-16 03:38:00 +02:00
Michael Niedermayer
6322bc0b90 fate: some shells parse $11 as ${1}1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-16 00:29:09 +02:00
Michael Niedermayer
1a34478b71 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Fix NASM include directive
  dsputil_mmx: Honor HAVE_AMD3DNOW
  lavf,lavd: remove all usage of AVFormatParameters from demuxers.
  jack: add 'channels' private option.
  VC-1: fix reading of custom PAR.
  Remove redundant and dubious video codec detection by its extradata
  mpeg12: remove repeat-field code disabled since May 2002
  patch checklist: suggest fate instead of regression tests
  Turn on resampling on sudden size change instead of bailing out during recode.
  avtools: reinitialise filter chain when input video stream changes dimensions

Conflicts:
	Makefile
	avconv.c
	doc/developer.texi
	ffplay.c
	libavcodec/x86/dsputil_mmx.c
	libavdevice/libdc1394.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-15 23:35:53 +02:00
Michael Niedermayer
6ae356c9a0 fate: allow specifying the tool to use for fate (avconv / ffmpeg) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-15 23:11:46 +02:00
Michael Niedermayer
d27dc69bc6 configure: fix datadir after avconv merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-15 22:36:13 +02:00
Dustin Brody
a3e215cdc9 svq3: propagate codec memory allocation failure in context init 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-15 21:26:34 +02:00
Dave Yeo
cc73511e8e Fix NASM include directive 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-08-15 11:24:35 -07:00
Alex Converse
48f7163f13 dsputil_mmx: Honor HAVE_AMD3DNOW 2011-08-15 11:20:08 -07:00
Anton Khirnov
c14fe6bc99 lavf,lavd: remove all usage of AVFormatParameters from demuxers. 
AVFormatParameters are converted into corresponding private options in
av_open_input_file/stream() compat wrappers, so accessing them from
demuxers is redundant.
 2011-08-15 19:59:48 +02:00
Anton Khirnov
a7c93dae55 jack: add 'channels' private option. 
Get rid of AVFormatParameters usage.
 2011-08-15 19:56:55 +02:00
Reimar Döffinger
0e86965514 VC-1: fix reading of custom PAR. 
Custom PAR num/denum are in 1-256 range.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-15 16:36:58 +02:00
Kostya Shishkov
e9fb763611 Remove redundant and dubious video codec detection by its extradata 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-15 14:03:01 +02:00
Dustin Brody
2bfdb34c8a mpeg12: remove repeat-field code disabled since May 2002 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-08-15 13:03:20 +02:00
Michael Niedermayer
2dbdb309ac patch checklist: suggest fate instead of regression tests 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-15 11:53:45 +02:00
Kostya
5c59fa56ed Turn on resampling on sudden size change instead of bailing out during recode. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-15 11:53:45 +02:00
Kostya
428c59d911 avtools: reinitialise filter chain when input video stream changes dimensions 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-15 11:53:40 +02:00
Michael Niedermayer
95b5b525b1 h264pred_init_arm: compile hotfix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-15 06:14:40 +02:00
Marton Balint
10b7b4a6a1 ffplay: more precise audio clock based on current time 
Since SDL has no audio buffer fullness info, one can get a much precise audio
clock based on the last time of the audio callback and the elapsed time since.

To achieve this I introduced the audio_current_pts and audio_current_pts_drift
variables (similar to video_current_pts and video_current_pts_drift) and
calculate them in the end of the audio callback, when VideoState->audio_clock
is already updated. The reference time I use is from the start of the audio
callback, because this way the amount of time used for audio decoding is not
interfereing with calculation.

I also replaced the audio_write_get_buf_size function with a calculated
variable because when the audio frame decoding is in progress audio_buf_size
and audio_buf_index are not stable, so using them from other threads are not a
good idea.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-15 03:49:07 +02:00
Michael Niedermayer
abf6b0d1ea af_aformat: hotfix compile due to strsep() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-15 03:35:25 +02:00
Michael Niedermayer
ee5234dd67 fate-rsync: switch to our server in preparation of h264 4:2:2 tests 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-15 00:41:23 +02:00
Baptiste Coudurier
1c967827d2 mxf: H.264/MPEG-4 AVC Intra support 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-15 00:40:54 +02:00
Baptiste Coudurier
231a6df9ea h264dec: h264: 4:2:2 intra decoding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-15 00:39:55 +02:00
Baptiste Coudurier
9a33078b64 dsputil_mmx: fix indention 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-15 00:37:19 +02:00
Baptiste Coudurier
6e7315f4a1 mpegvideo: Fix vshift vs hshift typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-15 00:34:41 +02:00
Michael Niedermayer
ecaf514328 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  aacenc: Fix number of coefficients used in a LFE channel.
  aacenc: Fix a segfault with grouped psymodel.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-14 19:49:11 +02:00
Michael Niedermayer
d9c9a0c767 sws: remove hScale16NX_c() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-14 19:34:48 +02:00
Michael Niedermayer
66bb5cd592 sws: remove hScale16N() and use ronalds reformated version of it. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-14 19:34:48 +02:00
Michael Niedermayer
3652409f5b sws: remove unneeded code from last merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-08-14 19:34:48 +02:00
Stefano Sabatini
b854c2a709 vf_unsharp: set default chroma size value to 5x5 
The previous default value 0x0 was not good, since it is not even
valid.
 2011-08-14 16:29:44 +02:00
Stefano Sabatini
63b61d55f9 vf_unsharp: fix out-of-buffer read 
In apply_unsharp(), when y is >= height, prevent out-of-buffer reading
from src, read from the last buffer line in src2 instead.

The check was implemented in the original unsharp libmpcodecs code and
lost in the port.

This also fixes output discrepancy between the two filters.
 2011-08-14 16:28:54 +02:00
Stefano Sabatini
6e89bdfecf lavfi: remove delogo mp wrapper 
The delogo filter has been natively integrated into libavfilter,
simplify.
 2011-08-14 12:26:44 +02:00
Stefano Sabatini
2701f6cc6a lavfi: port libmpcodecs delogo filter 
The ported filter supports named option parsing and more YUV formats.
 2011-08-14 12:17:10 +02:00
Mina Nagy Zaki
0a2295815d lavfi: add aformat filter 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-08-14 10:31:23 +02:00
Mina Nagy Zaki
3f07d40ea2 lavfi: add internal functions for parsing format arguments 
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
 2011-08-14 10:31:09 +02:00