virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
37,030 Commits 37 Branches 400 Tags 464 MiB
eaf4bf6df2
Commit Graph

37030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Langdale
eaf4bf6df2 CrystalHD: Initialise variables to silence valgrind. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 23:40:24 +01:00
Michael Niedermayer
89ddff92a3 Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs" 
This reverts commit 8e8c51318c.

Fixes Ticket873

Conflicts:

	tests/ref/acodec/pcm_s16be
	tests/ref/acodec/pcm_s24be
	tests/ref/acodec/pcm_s32be
	tests/ref/acodec/pcm_s8
	tests/ref/lavf/mov

Approved-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 23:40:24 +01:00
Alexander Strasser
9c909e8e79 build: Describe --nm and -ld options consistently 
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 23:40:24 +01:00
Michael Niedermayer
199d4478de pthread: Change a signal to a broadcast as multiple threads 
have been seen waiting and deadlocking on it in bug125.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 23:07:09 +01:00
Michael Niedermayer
2bb7396bfd base64: 10l endian fix. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 23:06:04 +01:00
Michael Niedermayer
c6baa4046a avfilter: add some asserts() to check refcounts. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 19:30:40 +01:00
Alexander Strasser
72b33eade1 build: Support selecting yasm-compatible assembler 
Makes it possible to select the name/path of the tool for compiling
the non-inline assembly code.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 16:31:54 +01:00
Michael Niedermayer
234405315f sws: Fix unscaled >8bit planar chroma handling. 
Fixes Ticket840

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 15:30:06 +01:00
Hendrik Leppkes
378b7beff5 mpeg12: fixed parsing in some mpeg2 streams 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 14:42:53 +01:00
Michael Niedermayer
e9a6152e17 lavc: fix FF_LOSS_COLORQUANT detection for gray8a->pal8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 14:42:53 +01:00
Reimar Döffinger
b4ec645f47 Extract some duplicated code. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-22 14:41:15 +01:00
Reimar Döffinger
b64b1608d8 Remove pointless and distracting () 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-22 14:41:15 +01:00
Reimar Döffinger
57608d9029 Simplify: just add header_size directly. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-22 14:41:15 +01:00
Reimar Döffinger
b09c93d7bc Move some duplicated code, simplify. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-22 14:41:15 +01:00
Reimar Döffinger
0a403588d2 Make variable that always has the same value const. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-22 14:41:15 +01:00
Reimar Döffinger
daa47fdd2c Optimized base64 decode by writing 3 bytes at once. 
About 25% faster.
decode: 248852 -> 200385 decicycles
(syntax check unchanged)

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-22 14:41:15 +01:00
Reimar Döffinger
420719e141 Cosmetics: add do {} while 0 to macro. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-22 14:41:15 +01:00
Michael Niedermayer
0421b6dc7a sws: In case of an invalid scaler algorithm, show the invalid value. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 06:57:17 +01:00
Michael Niedermayer
4f11bed7a1 avidec: fix "avidec.c:362: warning: st may be used uninitialized in this function" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 06:57:16 +01:00
Michael Niedermayer
9e34adfc02 RC: Fix initial buffer occupancy. 
Fixes Ticket880
Regression since bf174a70cd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 06:46:24 +01:00
Michael Niedermayer
887cd591a8 mpegpsmux: Fix integer overflow with huge VBV sizes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 06:46:23 +01:00
Michael Niedermayer
018a6645bc aacenc: Fix bug in writing libavcodec_ident. 
the written length was off by 2 causing aac decoders to fail with the data.
lucky the encoder was marked as experimental and not used much

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 06:46:23 +01:00
Carl Eugen Hoyos
f746f37901 Support decoding gray8a tiff images. 2012-01-22 04:49:46 +01:00
Jean First
e8df18270a img2: add j2c file extension 
Some applications use the j2c extension for jpeg2000 codestream files.

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 00:46:19 +01:00
Jean First
39bf7ffeb5 pixdesc: cosmetics 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 00:46:19 +01:00
Michael Niedermayer
d1c48025a7 pngdec: Do not use SIMD paeth prediction for bpp=2 
Fixes decoding of basi4a08.png

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 00:46:19 +01:00
Michael Niedermayer
fd8a8373aa pngdec: Fix masks for interlaced decoding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 00:46:19 +01:00
Michael Niedermayer
602e97dfaa pngdec: Add some FF_DEBUG based av_logs. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 00:46:19 +01:00
Michael Niedermayer
657878f76e sws: fix copy case detection with gray8a. 
Fixes gray_alpha.png

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-22 00:46:19 +01:00
Michael Niedermayer
2478612fc0 lavc: Mark the err_detect constants as audio+video as they also apply to audio. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-21 23:48:50 +01:00
Michael Niedermayer
44d4fe9dad error_detection: put the old error detection constants back. 
The old constants are more useful to the end user and have
orthogonal meanings to the new ones.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-21 23:46:36 +01:00
Michael Niedermayer
c5c7e0ebc1 git show 2473a45c85 avconv.c | patch ffmpeg.c 
Original commit:
commit 2473a45c85
Author: Janne Grunau <janne-libav@jannau.net>
Date:   Wed Jan 18 10:53:41 2012 +0100

    threads: change the default for threads back to 1

    Using threaded decoding by default breaks backward compatibility if
    AVHWAccel is used or if an appliction sets threadunsafe callbacks.
    Avconv and avplay still use -threads auto if not specified.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-21 23:23:23 +01:00
Michael Niedermayer
b5a69e79c5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtpdec: Use our own SSRC in the SDES field when sending RRs
  Finalize changelog for 0.8 Release
  Prepare for 0.8 Release
  threads: change the default for threads back to 1
  threads: update slice_count and slice_offset from user context
  aviocat: Remove useless includes
  doc/APIChanges: fill in missing dates and hashes
  Revert "avserver: fix build after the next bump."
  mpegaudiodec: switch error detection check to AV_EF_BUFFER
  lavf: rename fer option and document resulting (f_)err_detect options
  lavc: rename err_filter option to err_detect and document it
  mpegvideo: fix invalid memory access for small video dimensions
  movenc: Reorder entries in the MOVIentry struct, for tigheter packing
  rtsp: Remove extern declarations for variables that don't exist
  aviocat: Flush the output before closing

Conflicts:
	Changelog
	RELEASE
	libavcodec/mpegaudiodec.c
	libavcodec/pthread.c
	libavformat/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-21 23:11:27 +01:00
Martin Storsjö
ad7beb2cac rtpdec: Use our own SSRC in the SDES field when sending RRs 
The s->ssrc field is the sender's SSRC, we use ssrc + 1 to get
a collision free "unique" SSRC for ourselves in the RR part.
The SDES block in the RTCP packet should describe ourselves,
not the sender.

This was fixed for the RR part in 952139a322, but wasn't
fixed for the SDES part until now.

This could cause some Axis cameras to send RTCP BYE packets
to us due to the SSRC collision.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-01-21 22:18:12 +02:00
Reinhard Tartler
4b63cc18bc Finalize changelog for 0.8 Release 2012-01-21 18:37:25 +01:00
Carl Eugen Hoyos
9e53f62be1 Support decoding Avid DS Uncompressed (SUDS). 
Fixes ticket #934
 2012-01-21 17:58:26 +01:00
Reimar Döffinger
def19c9036 Unroll base64 decode loop. 
Around 50% faster.
decode:       374139 -> 248852 decicycles
syntax check: 236955 -> 123854 decicycles

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-21 16:35:11 +01:00
Reinhard Tartler
fd1a1f1484 Prepare for 0.8 Release 2012-01-21 14:54:31 +01:00
Reimar Döffinger
523f676b51 Use a full table for base64 decode. 
Also encodes error or end marker into table.
About 20% faster.
decode:       466491 -> 374139 decicycles
syntax check: 236955 -> 161182 decicycles

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-21 14:52:05 +01:00
Reimar Döffinger
d41c824b23 Fix valgrind FATE for out-of-tree builds. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-21 14:52:05 +01:00
Stefano Sabatini
a9117c755e lavfi: fix mp and mandelbrot descriptions to make them complete sentences 
This is consistent with the other filter descriptions.
 2012-01-21 14:40:46 +01:00
Janne Grunau
2473a45c85 threads: change the default for threads back to 1 
Using threaded decoding by default breaks backward compatibility if
AVHWAccel is used or if an appliction sets threadunsafe callbacks.
Avconv and avplay still use -threads auto if not specified.
 2012-01-21 13:26:44 +01:00
Janne Grunau
afb8b207d6 threads: update slice_count and slice_offset from user context 
They are used to signal the number of slices and offsets of each slice
out of band to the decoder.
 2012-01-21 13:26:44 +01:00
Reimar Döffinger
8650d5faf9 base64: more thorough decode tests. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-21 12:04:46 +01:00
Reimar Döffinger
77b90f0cd0 Add a --valgrind configure option. 
If specified runs "make fate" through valgrind using the
given valgrind binary.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-01-21 12:04:46 +01:00
Martin Storsjö
7ba34575fd aviocat: Remove useless includes 
Also include stdlib.h explicitly - currently it is used
implicitly via avformat.h.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-01-21 12:04:02 +02:00
Anton Khirnov
7512bb74f2 doc/APIChanges: fill in missing dates and hashes 2012-01-21 08:48:53 +01:00
Anton Khirnov
97e3f94b61 Revert "avserver: fix build after the next bump." 
This temporarily (until 0.8 is released) reverts commit
8e1340abc3. That commit breaks shared
builds because of symbol hiding. Reverting it will enable shared builds
for 0.8
 2012-01-21 08:40:47 +01:00
Dustin Brody
d2a0041c20 mpegaudiodec: switch error detection check to AV_EF_BUFFER 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-01-21 08:38:12 +01:00
Dustin Brody
5124423ec3 lavf: rename fer option and document resulting (f_)err_detect options 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-01-21 08:33:05 +01:00