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
42,726 Commits 37 Branches 400 Tags 460 MiB
f7e0c18549
Commit Graph

42726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
f7e0c18549 vf_overlay: prevent premature freeing of cur_buf 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-21 22:17:57 +02:00
Michael Niedermayer
0ecaa447f6 vf_overlay: use unref_bufferP() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-21 22:17:53 +02:00
Michael Niedermayer
dc49105c7f sink_buffer: prevent prematurely freeing of cur_buf 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-21 22:17:36 +02:00
Michael Niedermayer
1890853976 vf_thumbnail: prevent premature freeing of ref 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-21 22:17:31 +02:00
Michael Niedermayer
5aab307f30 vf_colormatrix: avoid using out_buf 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-21 22:17:28 +02:00
Reimar Döffinger
313d1981ad zerocodec: fix direct rendering. 
Set picture type before calling get_buffer.
This allows the DR application to make better decisions.
It also fixes a resource leak in case of missing reference frames
since it would call get_buffer but never release_buffer.
Also use FFSWAP to ensure that the AVFrame is properly initialized
in the next get_buffer (in particular that data[0] is NULL).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-07-21 21:11:37 +02:00
Paul B Mahol
a36f19e942 libopenjpegdec: set cp_reduce value only once 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-21 16:12:04 +00:00
Paul B Mahol
881e0de640 iff: pass context to av_log_ask_for_sample 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-21 16:06:36 +00:00
Paul B Mahol
ad69e778b7 iff: remove dupe ID_ANNO definition 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-21 10:30:12 +00:00
Stefano Sabatini
beef7a6328 doc/outdevs: fix @code{} syntax in caca device docs 2012-07-21 10:17:02 +02:00
Stefano Sabatini
f1a7124d30 Changelog: add entry for the caca device 2012-07-21 10:15:44 +02:00
Michael Niedermayer
17352ad315 alacdec: fix packed sample output with 5.1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-21 06:39:01 +02:00
Piotr Bandurski
3800facac6 riff: add G723_1 wav tag 
Reveiwed-by: compn <tempn@twmi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-21 05:48:31 +02:00
Marton Balint
b99e9ee938 ac3dec: set decode_error_flags field in ac3 codec 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-21 05:48:31 +02:00
Marton Balint
016a472009 avcodec: add decode_error_flags field to AVFrame 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-21 05:48:31 +02:00
Paul B Mahol
296c1b6bd1 libcaca output device 2012-07-21 03:33:02 +00:00
Michael Niedermayer
3c033d00f5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libopenjpeg: introduce lowres and lowqual private options
  FATE: add a test for flac cover art.
  cafdec: allow larger ALAC magic cookie
  alac: fix channel pointer assignment for 24 and 32-bit

Conflicts:
	libavcodec/alac.c
	libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-21 04:25:11 +02:00
Paul B Mahol
85761efa95 tiertexseq: remove redundant string from log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-20 19:44:26 +00:00
Nicolas George
fd58678b86 v4l2: remove call to v4l2_fd_open. 
v4l2_fd_open is already called at the end of v4l2_open;
calling a second time leaks structures inside libv4l2.

Fix trac ticket #1560.
 2012-07-20 21:12:10 +02:00
Paul B Mahol
b040ffc84c exr: display warning if multiple compression attributes are found 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-20 18:13:25 +00:00
Paul B Mahol
01f76a779c exr: merge common code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-20 18:13:25 +00:00
Paul B Mahol
a2dab7512e exr: compression attribute is mandatory 
Do not continue decoding if one is missing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-07-20 18:13:25 +00:00
chinshou
55de89e25d cmdutils/alloc_buffer: fix typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-20 16:42:29 +02:00
Joseph Artsimovich
99c4e91dfa dnxhd: Fix 10-bit DNxHD quant matrices 
Convert them to zigzag order, as the rest of them are.

When I was adding support for 10-bit DNxHD, I just copy-pasted the
missing quant matrices from the spec. Now it turns out the existing
matrices in dnxhddata.c were in zigzag order. This resulted in wrong
quantization for 10-bit DNxHD. The attached patch fixes the problem by
converting 10-bit quant matrices to zigzag order.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-20 15:24:27 +02:00
Michael Niedermayer
a4f94f24b4 udp: fix compilation when HAVE_PTHREAD_CANCEL isnt defined 
This happens with for example mplayer.
Fixing it in ffmpeg allows new ffmpeg to be compiled with older mplayer
which would not be possible if the fix was just in mplayer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-20 14:58:11 +02:00
Michael Niedermayer
7c6ebe2b97 alac: drop packed sample output support with the next major bump 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-20 14:11:09 +02:00
Luca Barbato
ce64e5bfd1 libopenjpeg: introduce lowres and lowqual private options 
OpenJPEG can decode in lower resolution or decode only a number
of enhancement layers.
 2012-07-20 13:23:18 +02:00
Nicolas George
cb6a20fa56 lavfi: add FF_*LINK_IDX convenience macros. 2012-07-20 13:16:24 +02:00
Nicolas George
461f506f7b lavc: set best_effort_timestamp for audio too. 2012-07-20 13:16:23 +02:00
Nicolas George
97f86680eb lavfi: make copy_buffer_ref common. 2012-07-20 13:16:23 +02:00
Nicolas George
b0629366a2 lavf: make cmdutils's check_stream_specifier public. 
The new function is called avformat_match_stream_specifier()
and does not include logging the error message.
 2012-07-20 13:16:23 +02:00
Stefano Sabatini
3bd3e46c91 doc/avtools-common-opts: fix a few typos in the "Stream specifiers" section 2012-07-20 12:56:28 +02:00
Nicolas George
b34ce5a26b faq: explain dependency problems with static libs. 2012-07-20 11:40:26 +02:00
Nicolas George
30549294ef matroska: add support for Opus. 
Opus in Matroska is still a draft.
 2012-07-20 11:19:01 +02:00
Nicolas George
a6cf296bd9 lavc: Opus decoder using libopus. 2012-07-20 11:18:58 +02:00
Nicolas George
e62fd6619f oggdec: add support for Opus codec. 
This patch also introduces CODEC_ID_OPUS.
 2012-07-20 11:16:52 +02:00
Nicolas George
bf8ce5a5c3 ffmpeg: probe buffersinks once more after EOF. 
Reap buffers stored in the buffer sinks even when
the avfilter_graph_request_oldest() loop only returns EOF.

avfilter_graph_request_oldest() can cause frames to arrive
to the sinks even when it returns EOF.
 2012-07-20 10:18:45 +02:00
Anton Khirnov
5eb9c495af FATE: add a test for flac cover art. 2012-07-20 10:17:25 +02:00
Michael Niedermayer
5e99df019a alacdec: several players have problems with planar audio still thus temporary put packed output back by default 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-20 04:48:25 +02:00
Michael Niedermayer
e2c96fbf3e ffplay: fix warning that i just mistakenly introduced 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-20 03:47:11 +02:00
Michael Niedermayer
cdafec69ce ffplay: fix planar audio 
This caused ALAC to fail since the last merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-20 03:41:17 +02:00
Justin Ruggles
1749e12f45 cafdec: allow larger ALAC magic cookie 
It already skips any extra bytes at the end, and apparently there are some
samples in the wild with larger 'kuki' chunks.
 2012-07-19 20:14:29 -04:00
Justin Ruggles
4cd22b7738 alac: fix channel pointer assignment for 24 and 32-bit 
Needs to be done separately for each element.
 2012-07-19 20:14:29 -04:00
Stefano Sabatini
7e17389c1e lavd/sdl: use verb in options help message 
An help message tells what an option does, not what its argument is.
 2012-07-19 23:56:59 +02:00
Nicolas George
885fc05865 lavf: count skipped samples for initial timestamps. 
If skip_samples is set and timestamps are synthesized using durations,
make them start at -skip_samples (rescaled) instead of 0,
so that the timestamp of the first undiscarded sample is 0.
 2012-07-19 23:41:03 +02:00
Nicolas George
cd08900393 lavc: update pkt_duration for skipped samples. 
Also: factor the the computation of the timestamp difference.
 2012-07-19 23:41:03 +02:00
Nicolas George
d853ed46b1 Revert "ffmpeg: set pkt_timebase" 
This reverts commit 744bd8d08c.

pkt_timebase is now set by av_codec_set_pkt_timebase.
If some demuxer set AVStream.time_base directly,
it need to be fixed. There is a warning to detect it.
 2012-07-19 23:41:03 +02:00
Nicolas George
0e57d79b0c lavf: set pkt_timebase at the same time as stream->time_base. 2012-07-19 23:41:03 +02:00
Nicolas George
0e18ac5611 lavc: warn when impossible to adjust timestamps for skipped samples. 
It is likely to happen if pkt_timebase was not set.
 2012-07-19 23:41:03 +02:00
Nicolas George
11ce1cf9a7 lavc: add debug info about skipped samples. 2012-07-19 23:41:03 +02:00