virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
28,502 Commits 37 Branches 400 Tags 465 MiB
a6be21d3ba
Commit Graph

28502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
a6be21d3ba Revert "replace FFmpeg with Libav in doc/" 
This reverts commit f8a45fa1b1.

Conflicts:

	doc/optimization.txt
 2011-03-17 17:26:45 +01:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master' 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 17:22:52 +01:00
Peter Ross
e309fdc701 Add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 15:11:31 +01:00
Philip Langdale
969eb21ba2 CrystalHD: Use doxygen compatible comments where relevant. 
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 13:02:23 +01:00
Martin Storsjö
f1f60f5252 lavf: Make make_absolute_url a lavf internal function 
This is shared by both applehttp demuxer and protocol.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-17 12:28:37 +01:00
Martin Storsjö
dc6fdad5dc Add missed APIchanges and changelog entries 
Add an APIchanges entry for the av_pkt_dump2 and av_pkt_dump_log2
functions, and a changelog entry for the apple http live streaming
protocol handler.

Since neither of them got a minor bump at commit time, but were
applied before the jv demuxer, they all can be considered added
in this minor version.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-17 12:28:37 +01:00
Martin Storsjö
bc040cb3e2 applehttp: Fix a typo in a comment 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-17 11:20:21 +00:00
Stefano Sabatini
68d875addc lavf: make av_interleave_packet() return meaningful error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c5dcb3d493)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-03-17 07:30:09 +01:00
Stefano Sabatini
70abc32314 lavf: enable av_dlog message in av_interleaved_write_frame() 
Help debugging timestamp issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d541c8b468)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-03-17 07:29:57 +01:00
Stefano Sabatini
79f43a8cb6 lavf: enable av_dlog() in compute_pkt_fields2() 
Turns a comment into an av_dlog() instruction, also add a commented
issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 77f21ce464)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-03-17 07:29:47 +01:00
Nathan Caldwell
4afedfd8e5 aacenc: cosmetics, indentation, and comment clarification 
Correct bad indentation in aaccoder
Clarify and correct comments in 3GPP psymodel, other cosmetics.
 2011-03-16 23:35:39 -04:00
Nathan Caldwell
b7c96769c5 aacenc: Refactor the parts of the AAC psymodel. 
3GPP:
Remove ffac from and move min_snr out of AacPsyBand.
Rearrange AacPsyCoeffs to make it easier to implement energy spreading.
Rename the band[] array to bands[]
Copy energies and thresholds at the end of analysis.

LAME:
Use a loop instead of an if chain in LAME windowing.
 2011-03-16 23:34:12 -04:00
Young Han Lee
f578854efc aaccoder: Change FFMAX for allzero flag to OR bit operation 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 23:12:43 -04:00
Anton Khirnov
b7f2fdde74 avio: rename put_flush_packet -> avio_flush 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
35f1023592 avio: deprecate url_close_buf 
It's not used anywhere and its return value looks broken.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
83fddaeb81 avio: deprecate url_open_buf 
It's only used in one place and does the same thing as
avio_alloc_context.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
eda4cf92d7 avio: always compile avio_printf, rather than on CONFIG_MUXERS 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
d9d86e00b2 avio: avio_ prefix for url_fprintf 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
af02073225 avio: change avio_tell/skip from macros to inline functions 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:39 -04:00
Anton Khirnov
59f65d9579 avio: make url_setbufsize internal. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:38 -04:00
Anton Khirnov
4839c192de lavf: move ff_get_v from avio.h to avio_internal.h 
And rename it to ffio_read_varlen.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:59:38 -04:00
Anton Khirnov
073f8b10d8 nutenc: mux chapters. 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-03-17 03:34:16 +01:00
Luca Barbato
4af9c1a56f doc: update applehttp documentation 
Integrate more comments from Stefano.
 2011-03-17 03:34:16 +01:00
Anton Khirnov
45a8a02a41 lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 22:24:51 -04:00
Stefano Sabatini
c5dcb3d493 lavf: make av_interleave_packet() return meaningful error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 01:35:08 +01:00
Stefano Sabatini
77f21ce464 lavf: enable av_dlog() in compute_pkt_fields2() 
Turns a comment into an av_dlog() instruction, also add a commented
issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 01:35:08 +01:00
Stefano Sabatini
d541c8b468 lavf: enable av_dlog message in av_interleaved_write_frame() 
Help debugging timestamp issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 01:35:08 +01:00
Thierry Foucu
a7844c580d Fix compilation error when CONFIG_AVFILTER is not defined. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 01:35:08 +01:00
Ramiro Polla
cbf5d22d24 Remove occurrences of my old email address 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-16 23:19:40 +00:00
Mans Rullgard
381d37fda9 dsputil: add bswap16_buf() 
There are several places where a buffer is byte-swapped in 16-bit units.
This allows them to share code which can be optimised for various
architectures.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-16 23:19:40 +00:00
Sean McGovern
dff68563d8 darwin: use -read_only_relocs flag only on 32-bit x86 
Avoids the linker warning:
ld: warning: -read_only_relocs cannot be used with x86_64

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-16 23:18:27 +00:00
Aurelien Jacobs
6f1260f870 matroskadec: set a default duration also for packets comming from a simple block 2011-03-16 23:37:16 +01:00
Baptiste Coudurier
69aab68037 Use av_strdup instead of strdup, fixes mingw build 2011-03-16 14:26:25 -07:00
Janne Grunau
f8a45fa1b1 replace FFmpeg with Libav in doc/ 
unless it stands for ffmpeg the program or is historic
 2011-03-16 22:01:01 +01:00
Janne Grunau
a03be6e1ba use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* 2011-03-16 21:54:39 +01:00
Janne Grunau
29ba091136 replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION 
also update the multiple inclusion guards in config.h|mak
 2011-03-16 21:54:39 +01:00
Janne Grunau
070c5d0f35 partially rename FFmpeg to Libav 
update mailing list references and irc channels in configure
 2011-03-16 21:54:39 +01:00
Ramiro Polla
57149a92f8 Remove occurrences of my old email address. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-16 20:07:38 +01:00
Anton Khirnov
fed5676ffe mp3enc: remove mp3_write_packet(), use ff_raw_write_packet() instead 
The two functions are identical, no point in duplicating code here.
 2011-03-16 10:20:24 -04:00
Kostya
8312e3fc90 Do not attempt to decode APE file with no frames 
This fixes invalid reads/writes with this sample:
http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt
 2011-03-16 12:53:52 +01:00
Anton Khirnov
1dac4d5547 jvdec: don't use deprecated url_feof() 2011-03-16 12:24:23 +01:00
Justin Ruggles
79414257e2 mathops: fix MULL() when the compiler does not inline the function. 
If the function is not inlined, an immmediate cannot be used for the
shift parameter, so the %cl register must be used instead in that case.

This fixes compilation for x86-32 using gcc with --disable-optimizations.
 2011-03-15 20:49:37 -04:00
Kostya Shishkov
1c31b26bdf Do not attempt to decode APE file with no frames. 
This fixes invalid reads/writes with this sample:
http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt
 2011-03-15 20:37:37 +01:00
Anton Khirnov
56e2ac6b45 id3v2: merge TYER/TDAT/TIME to date tag 2011-03-15 13:57:52 -04:00
Justin Ruggles
aaff3b312e mathops: change "g" constraint to "rm" in x86-32 version of MUL64(). 
The 1-arg imul instruction cannot take an immediate argument, only a register
or memory argument.
 2011-03-15 13:43:47 -04:00
Justin Ruggles
b181b8fb96 mathops: convert MULL/MULH/MUL64 to inline functions rather than macros. 
This fixes unexpected name collisions that were occurring with variables
declared within the macros.
It also fixes the fate-acodec-ac3_fixed regression test on x86-32.
 2011-03-15 13:43:47 -04:00
Michael Niedermayer
6947b0c42e Merge remote-tracking branch 'newdev/master' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-15 16:48:42 +01:00
Michael Niedermayer
27293b840c Revert "ac3enc: shift coefficients to 24-bit following MDCT rather than using an exponent offset." 
This reverts commit 7e0a284b9f.
revert at authors request due to better impementation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-15 15:12:17 +01:00
Michael Niedermayer
f7a5e7791d Revert "ac3enc: add SIMD-optimized shifting functions for use with the fixed-point AC3 encoder" 
This reverts commit cc4d3dd3e2.
revert at authors request due to better impementation being available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-15 15:11:22 +01:00
Nicolas George
c76374c6db Use AVERROR_EXIT with url_interrupt_cb. 
Functions interrupted by url_interrupt_cb should not be restarted.
Therefore using AVERROR(EINTR) was wrong, as it did not allow to distinguish
when the underlying system call was interrupted and actually needed to be
restarted.

This fixes roundup issues 2657 and 2659 (ffplay not exiting for streamed
content).

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-15 08:09:19 -04:00