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
41,291 Commits 37 Branches 400 Tags 460 MiB
b0f6df28de
Commit Graph

41291 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clément Bœsch
8619362ff1 ffprobe: fix C escaping. 2012-05-30 01:07:41 +02:00
Luca Barbato
43b50e62c4 avprobe: correctly set the default formatter 2012-05-29 14:09:43 -07:00
Marton Balint
f1a75aa033 ffplay: remove VideoPicture pix_fmt and use frame pixel format instead 
VideoPicture pixel format is set at allocation time, therefore it is not
reflecting the proper value.

Fixes files with changing pixel format in the avfilter disabled case.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2012-05-29 22:41:50 +02:00
Marton Balint
15751e3fdd ffplay: only request 4 or 6 channels from SDL, if SDL version is at least 1.2.8 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2012-05-29 22:41:50 +02:00
Marton Balint
a6f51de3bf ffplay: add pause audio feature in the middle of a packet 
Fixes ticket 215.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2012-05-29 22:41:50 +02:00
Marton Balint
d872e11300 ffplay: remove VideoPicture duration field 
We are not using it.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2012-05-29 22:41:50 +02:00
Clément Bœsch
2d52ee8a1a lavf/microdvd: support events lasting to the next one. 
Example:

{3350}{}this subtitle...
{3390}{}...continues up to...
{4000}{4500}this one.
{4600}{}and now...
{4800}{}...to the end of the presentation
 2012-05-29 21:33:28 +02:00
Clément Bœsch
d51e08bb89 lavc: switch from ts_end to duration in ff_ass_add_rect. 
Make possible a end-to-presentation duration.
 2012-05-29 21:33:28 +02:00
Justin Ruggles
b75726cb79 lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs 2012-05-29 15:33:25 -04:00
Justin Ruggles
c140fb2cbc lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs 2012-05-29 15:33:18 -04:00
Justin Ruggles
8dfc122719 lavr: add C functions for mixing 2 to 1 channels with s16p format 2012-05-29 15:16:20 -04:00
Luca Barbato
528995589f avprobe: move formatter functions in the context 
Avoid possible clashes.
 2012-05-29 11:00:12 -07:00
Michael Niedermayer
e7cb161515 ape: Fix null ptr dereference with files missing a seekatable. 
Such files are currently not supported as the table is used at several points

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-29 19:56:07 +02:00
Michael Niedermayer
5880d78873 movdec: Check count of stts/ctts elements instead of just the pointer. 
Fixes overreading the array

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-29 19:56:07 +02:00
Michael Niedermayer
1b8741a684 4xm: fix division by zero caused by bps<8 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-29 19:56:07 +02:00
Anton Khirnov
c9cc76290f avconv: extend -r to work on any input stream. 
This is done by automatically inserting a setpts filter.
 2012-05-29 19:19:17 +02:00
Anton Khirnov
4f81a5072a doc/avconv: expand documentation for the -s option. 2012-05-29 19:19:16 +02:00
Anton Khirnov
cf6c38c62b avconv: don't print filters inserted by avconv in stream mappings. 2012-05-29 19:19:16 +02:00
Anton Khirnov
8daf21d567 avconv: merge configuration code for complex and simple filters 
Some tests change because -s now inserts the scaler to the end instead
of beginning of the filtergraph.
 2012-05-29 19:19:16 +02:00
Anton Khirnov
a977d91e28 avconv: split configuring input filters out of configure_complex_filter 2012-05-29 19:19:16 +02:00
Clément Bœsch
dae8505492 ffprobe: make -of an alias for -print_format. 
This is for interoperability purpose with the fork.
 2012-05-29 18:50:20 +02:00
Mans Rullgard
f919cc7df6 fate: fix acodec/vsynth tests for make 3.81 
GNU make 3.81 applies pattern rules in declaration order rather than
by stem length as in 3.82.  This moves the more generic patterns above
the more specific ones such that they work with either make version.
Some of the vsynth patterns are also simplified a little.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-29 17:49:44 +01:00
Stefano Sabatini
ad381ac97f ffprobe: fix chapter printing, fix JSON output 
Make writer_print_chapter_header() set the internal values *before* the
private writer callback is called, otherwise the accessed internal values
will be wrong.

Fix regression introduced in fa6cb2fdff.

Found-By: Daemon404
 2012-05-29 18:11:36 +02:00
Hendrik Leppkes
c58bcead3b pcm_mpeg: fix number of consumed bytes to include the header. 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-05-29 16:08:56 +02:00
Janne Grunau
12d42cd7a8 avfilter: include required header file avfilter.h in video.h 2012-05-29 15:36:06 +02:00
Vitor Sessak
4a301706fd x86: Avoid movs on BUTTERFLYPS when in AVX mode 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-05-29 15:29:46 +02:00
Vitor Sessak
bac0729d9e x86: use new schema for ASM macros 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2012-05-29 14:49:45 +02:00
Stefano Sabatini
a5e83a5d4c Changelog: apply misc formatting fixes 2012-05-29 13:06:38 +02:00
Stefano Sabatini
4eb1ff6582 Changelog: remove asplit entry from 0.11, it was added in 0.10 2012-05-29 13:06:38 +02:00
Stefano Sabatini
89d49acb3b ffprobe: add INI writer 
Liberally based on the work of Luca Barbato <lu_zero@gentoo.org>, done
for libav/avprobe.
 2012-05-29 13:06:33 +02:00
Paul B Mahol
908c045f3a avfilter: use designated initializer for class 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-05-29 07:59:21 +00:00
Mans Rullgard
7263cd5544 fate: convert codec-regression.sh to makefile rules 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-29 08:35:41 +01:00
Mans Rullgard
47b5996bb0 fate: allow tests to specify unit size for psnr comparison 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-29 08:27:19 +01:00
Mans Rullgard
7e5880e0cb fate: teach videogen/rotozoom to output a single raw video stream 
This makes videogen/rotozoom output a raw video stream on stdout
if no output directory is specified.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-05-29 08:27:19 +01:00
Clément Bœsch
f0c15ecd45 doc/syntax: escape '@' to fix a warning. 
Fix the following warning:
doc/syntax.texi:147: warning: Accent command `@"' must not be followed by whitespace
 2012-05-29 07:40:58 +02:00
Stefano Sabatini
67b7631040 lavc: prettify printing of some codec tags which contains non alphanumeric characters 
Make av_get_codec_tag_string() show codec tag string characters in a more
intelligible ways. For example the ascii char "@" is used as a number, so
should be displayed like "[64]" rather than as a printable character.

Apart alphanumeric chars, only the characters ' ' and '.' are used
literally in codec tags, all the other characters represent numbers.
 2012-05-29 01:02:50 +02:00
Stefano Sabatini
fa6cb2fdff ffprobe: add multiple_sections field to WriterContext 
Move the field "multiple_entries" from the JSON writer private context to
WriterContext, and rename it "multiple_sections".

This allows to factorize the code with the pending INI format patch.
 2012-05-29 01:02:50 +02:00
Stefano Sabatini
c365cdf202 ffprobe: add support to '\b' and '\f' escaping in c_escape_str() 2012-05-29 01:02:47 +02:00
Stefano Sabatini
6994b552a6 ffprobe: make c_escape_str() documentation terser 
Avoid to specify implementation details, better to check the code for
that.
 2012-05-29 01:02:13 +02:00
Michael Niedermayer
59a78290b6 lavfi: use getter/setter functions for AVFrame.pkt_pos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 23:45:17 +02:00
Philip Langdale
ea60a11e8e movenc: Fix muxing of Apple Quicktime chapters. v3 
There is basic support for muxing chapter information into the
Apple Quicktime format already, but there are two errors which
prevent correct detection on the player side.

1) A special apple 'text' atom needs to be included inside the
gmhd atom.

2) The *different* 'text' atom inside the 'stsd' atom needs a
proper header.

With these changes, the chapters are now picked up by Apple
players and reported correctly by tools like mediainfo and mp4chaps.

v3 Update: The stub TextSampleEntry creation is moved to where the
chapter track is created so it's now specific to this track.

Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-28 22:52:23 +02:00
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