ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-28 01:00:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,553 Commits 37 Branches 398 Tags 540 MiB
c8422f04a3
Commit Graph

66553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wm4
c8422f04a3 avformat/aviobuf: fix avio_flush() for read streams 
avio_flush() did nothing useful for read streams. Fix it to behave as
expected, and discard the currently read buffer properly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-30 21:31:08 +02:00
Jeffrey Wescott
07de0db74b avformat/flvenc: When using "-c:d copy", don't require a codec for passing the AMF metadata through from input to output. 2014-09-30 20:27:07 +02:00
Michael Niedermayer
cda5d89def avcodec/bitstream_filter: Use av_bitstream_filter_next() instead of direct access in av_bitstream_filter_init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-30 20:27:07 +02:00
Clément Bœsch
0eb4a42812 avcodec/srtdec: use AVBPrint API 2014-09-30 20:21:15 +02:00
Clément Bœsch
55180b3299 Kill timed SRT 2014-09-30 20:21:14 +02:00
Benoit Fouet
d5ddcb5f8e avcodec/h264_mp4toannexb_bsf: use the given padding in h264_extradata_to_annexb(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-30 13:12:36 +02:00
Benoit Fouet
1cf4d2e9be avcodec/h264_mp4toannexb_bsf: add a case when only SPS/PPS is in the stream. 
When only SPS or PPS is present in the stream, copy the missing one from
AVCC before insertion to the output stream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-30 11:33:06 +02:00
Alexander Drozdov
08ccc474b7 RTMP: fix FD leak in rtmp_open() 
If we setup AVIO interrupt callback and it will be returns 1 on socket
timeouts and we try to connect to non-existing streams on some servers
(like nginx-rtmp) we got FD leak.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-30 11:26:25 +02:00
Michael Niedermayer
61c0683080 avcodec/mpegvideo_enc: Fix leak on bitstream buffer reallocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-30 05:19:20 +02:00
Michael Niedermayer
1441641d78 avcodec/mpegvideo_enc: Allocate only a small buffer and reallocate as needed 
This should reduce the memory requirement

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-29 21:50:53 +02:00
Michael Niedermayer
a2d5f6b9db Merge commit '19133e96d30e3f80dbae236ef081aedef419a6bf' 
* commit '19133e96d30e3f80dbae236ef081aedef419a6bf':
  lavf: fix memleaks in avformat_find_stream_info()

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-29 21:25:09 +02:00
Michael Niedermayer
56c47364c3 Merge commit '2cd7c99498b1bcb450c328459cf85a686ce83456' 
* commit '2cd7c99498b1bcb450c328459cf85a686ce83456':
  h264: reset ret to avoid propagating minor failures

See: 47048aa30b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-29 21:05:20 +02:00
Michael Niedermayer
46807921f7 Merge commit 'e3a00acde05c925617dc19b5373969d864bf8414' 
* commit 'e3a00acde05c925617dc19b5373969d864bf8414':
  hevc: Initialize mergecand_list to 0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-29 21:02:15 +02:00
Michael Niedermayer
77ab7407c2 Merge commit 'a05f5052fef3b3743fab7846da12861d8a8098ec' 
* commit 'a05f5052fef3b3743fab7846da12861d8a8098ec':
  sdp: Make opus declaration conform to the spec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-29 20:26:15 +02:00
Justin Ruggles
19133e96d3 lavf: fix memleaks in avformat_find_stream_info() 
When AVFMT_FLAG_NOBUFFER is set, the packets are not added to the
AVFormatContext packet list, so they need to be freed when they are
no longer needed.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-09-29 17:54:25 +00:00
Michael Niedermayer
cf32181b70 avcodec/put_bits: Add rebase_put_bits() 
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-29 15:22:37 +02:00
Michael Niedermayer
2cd7c99498 h264: reset ret to avoid propagating minor failures 
Unbreak 772d150a6e.

CC: libav-stable@libav.org
Bug-Id: 750 / 905753
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-09-29 12:33:55 +01:00
Luca Barbato
e3a00acde0 hevc: Initialize mergecand_list to 0 
Unbreak cf6090dc62.

CC: libav-stable@libav.org
Sample-Id: hevc-conformance-LTRPSPS_A_Qualcomm_1
 2014-09-29 12:33:46 +01:00
Michael Niedermayer
8ba6945487 avcodec/utils: Fix off by 1 error causing unneeded allocation in ff_fast_malloc() 
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-29 12:56:45 +02:00
Timothy B. Terriberry
a05f5052fe sdp: Make opus declaration conform to the spec 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-09-29 13:48:42 +03:00
Michael Niedermayer
3f5095f213 avformat/hlsenc: fix outter typo 
Found-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-29 00:19:43 +02:00
Michael Niedermayer
755f7929c6 avcodec/mpegvideo_enc: Only enforce rc_max_available_vbv_use on first encoding attempt 
This reduces repeatly re-encoding to achieve VBV compliance

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-28 23:59:44 +02:00
Michael Niedermayer
b1a0fccd02 avformat/hlsenc: export inner muxer timebase 
Fixes "Non-monotonous DTS in output stream 0:0"
Fies Ticket 3797

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-28 22:27:33 +02:00
Michael Niedermayer
579a0fdc21 avutil/lls: Make unchanged function arguments const 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-28 19:32:07 +02:00
Michael Niedermayer
d22e88d120 avcodec/x86/fmtconvert: Fix operand size in ff_int32_to_float_fmul_array8_sse* 
Fixes acodec-dca2 fate failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-28 19:04:06 +02:00
Michael Niedermayer
b28f470df0 avutil/pca: Make argument of ff_pca_add() const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-28 16:17:18 +02:00
Michael Niedermayer
04152a31cb avcodec/vc1dec: Fixing is_intra, 2nd attempt 
This also un-does the fate changes from a52f443714,
leaving this fix without even small differences in the output, that is
a sample for which this makes a vissible difference is very welcome

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-28 15:10:40 +02:00
Michael Niedermayer
a52f443714 avcodec/vc1dec: fix is_intra block vs. mb bug 
Fixes CID1194380

There are no vissible differences in the changed fate samples. Only
a tiny number of pixels change by tiny amounts in the frames i checked
If someone has a file that shows a vissible difference, please post it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-28 14:27:35 +02:00
Reimar Döffinger
b7082d953f configure: add noexecstack to linker options if supported. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-09-28 10:01:24 +01:00
Michael Niedermayer
3956b12fde avcodec/libx265: enable psnr reporting when requested by the user 
This is similar to what is done in libx264.c

Fixes Ticket3567

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-28 04:14:43 +02:00
Michael Niedermayer
4d9a46fe31 avcodec/libx264: mark unchanged pointer arguments as const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-28 03:40:13 +02:00
Joakim Roubert
3edb9aaea6 avformat/hlsenc: Added parameter -hls_allow_cache 
The -hls_allow_cache parameter enables explicitly setting the
EXT-X-ALLOW-CACHE tag in the manifest file. That tag indicates
whether the client MAY or MUST NOT cache downloaded media
segments for later replay.

Valid values are 1 (=YES) or 0 (=NO) and the EXT-X-ALLOW-CACHE
will not show in the manifest for other values (or if
-hls_allow_cache is not used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-28 03:09:05 +02:00
Thilo Borgmann
dd16a0d8cc lavd/avfoundation: Add basic PCM audio support. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-28 02:31:38 +02:00
Michael Niedermayer
d85ebea3f3 avcodec/ac3enc_template: fix out of array read 
Found-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 20:34:44 +02:00
Michael Niedermayer
5672107ed6 Merge commit '551746680462538bb5ad7adf55fb1248190428ec' 
* commit '551746680462538bb5ad7adf55fb1248190428ec':
  configure: Provide a safe default for unknonw libcs

Conflicts:
	configure

This is not merged as it does not work with musl here, while
our previous solution does.

See: 170e2fd7c3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 18:23:39 +02:00
Luca Barbato
5517466804 configure: Provide a safe default for unknonw libcs 
Support musl out of box.

Amend commit 9d2cee52d3 that got
wrongly merged in its stead.
 2014-09-27 18:01:44 +02:00
Clément Bœsch
5ec90c90c6 avcodec/subviewerdec: remove old compat code 2014-09-27 17:55:29 +02:00
Clément Bœsch
180d7f330b avcodec/microdvddec: remove old compat code 2014-09-27 17:55:22 +02:00
Clément Bœsch
71f6275169 avformat/assdec: make sure to free allocated data in case of error 2014-09-27 17:49:49 +02:00
Clément Bœsch
0e6bad1229 avformat/assenc: mux an event header if none are found in extradata 2014-09-27 17:32:14 +02:00
Clément Bœsch
3a6fa38fb1 avformat/assdec: add myself to Copyright 2014-09-27 17:32:14 +02:00
Clément Bœsch
0aa5c5a89e avformat/assdec: reindent after previous commit 2014-09-27 17:32:13 +02:00
Clément Bœsch
9ec52e5533 avformat/assdec: make sure "Comments:" events end up in the header 2014-09-27 17:32:13 +02:00
Clément Bœsch
ff5f5cbb46 avformat/assdec: output ASS packets 
After this the order from the original file is stored through readorder
when doing ffmpeg -i input.ass -c copy output.mkv.

And now that the ASS muxer honors the ReadOrder, extracting the ass back
(without transcoding) restores the original order.
 2014-09-27 17:32:13 +02:00
lvqcl
e58fc44649 avutil/x86/cpu: fix cpuid sub-leaf selection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 13:21:31 +02:00
Michael Niedermayer
233d1acb70 tests/fate/microsoft: add -flags +bitexact to ilaced_twomv 
Should fix fate failure on alpha and pre sse2 x86

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 13:07:03 +02:00
Christophe Gisquet
f183febcda hevc: remove CodingTree 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 11:50:41 +02:00
Paul B Mahol
bfdf0f078a avfilter/signalstats: add more pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-09-27 07:28:06 +00:00
Michael Niedermayer
2ec4a84dca ffplay: Separate AVFrame from AVSubtitle 
This is more robust and should avoid false positives in coverity
That is if the type is ever mixed up, after this patch that would
just be a null pointer dereference instead of a random possibly
out of array access

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 03:54:36 +02:00
Michael Niedermayer
be5dd8aa55 Merge commit '4e03b2097ca59843ed65424a572b7acd5345f088' 
* commit '4e03b2097ca59843ed65424a572b7acd5345f088':
  mpeg12: Always invoke the get_format() callback

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-27 03:38:48 +02:00