f0b99112e3
Merge commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1'
...
* commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1':
tls_gnutls: Add missing includes for the gcrypt thread safety callbacks
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-28 21:21:07 +02:00
b06e82e738
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
lavc/x264: Support bgr0 as input pix_fmt.
lavf: Use av_codec_get_tag2() in avformat_query_codec().
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-28 14:12:46 +02:00
d4d90504a6
tls_gnutls: Add missing includes for the gcrypt thread safety callbacks
...
This fixes building with gcrypt-backed gnutls versions, broken
in 57cde2b180martin@martin.st >
2015-05-28 15:05:52 +03:00
5a3d2541bd
avformat/mxfenc: Support storing signal standard for D10 muxing
...
Reviewed-by: tim nicholson <nichot20@yahoo.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-28 12:36:08 +02:00
57eecd9e4f
lavf: Use av_codec_get_tag2() in avformat_query_codec().
...
av_codec_get_tag() can return 0 both in case of error and success.
2015-05-28 12:31:40 +02:00
7206b94fb8
network: Move variable declaration under an #if
...
Avoids an unused variable warning.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-28 03:06:05 +02:00
a9f1d584e5
lavf: move TLS-related ifdeffery to library specific files
...
There is no need to have this mess in network.c.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-27 22:24:00 +02:00
4a006b9eb7
lavf: split tls.c
...
Move the OpenSSL and GnuTLS implementations to their own files. Other
than the connection code (including options) and some boilerplate, no
code is actually shared.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-27 21:48:47 +02:00
07fc47909f
avformat/mpsubdec: Use double instead of float for timestamp calculations
...
This provides higher precission
Reviewed-by: Clément Bœsch <u@pkh.me >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-27 17:29:18 +02:00
f722009ad9
avformat/mp3dec: Ensure the buffer is large enough to avoid seeks from the first frame search
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-27 17:06:24 +02:00
2b3e9bbfb5
avformat/mp3: skip junk at the beginning of mp3 files
...
Apparently it can happen that a mp3 file has junk data between id3 tag
and actual mp3 data. Skip this to avoid outputting nonsense timestamps.
(Two packets had the same timestamps, because the mp3 parser failed to
compute a frame duration.)
In this case, the junk consisted of 1044 bytes of zero, which
incidentally is the same size as normal mp3 frames in this stream. I
suspect the mp3 was edited with some tool which wiped the Xing/LAME
headers. Data near the end of the file suggests it was encoded with
"LAME3.97", but the normal Xing/LAME headers are missing. So this could
be "normal". mpg123 also attempts to skip at least 64KB of junk data by
scanning for headers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-27 15:50:04 +02:00
2ae0396814
avformat/mpsubdec: change multipler to int, it only stores 1 and 100
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-27 15:24:34 +02:00
023040ed0d
avformat/movenc: Allow muxing mp3 with samplerate < 16khz if the user sets strict to -1
...
Fixes Ticket4267
Approved-by: Baptiste Coudurier <baptiste.coudurier@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-27 01:47:59 +02:00
57cde2b180
lavf: move TLS-related ifdeffery to library specific files
...
There is no need to have this mess in network.c.
Signed-off-by: Martin Storsjö <martin@martin.st >
2015-05-26 21:48:51 +03:00
d8ffb2055f
lavf: split tls.c
...
Move the OpenSSL and GnuTLS implementations to their own files. Other
than the connection code (including options) and some boilerplate, no
code is actually shared.
Signed-off-by: Martin Storsjö <martin@martin.st >
2015-05-26 21:48:32 +03:00
cf86fd0069
avformat/matroskaenc: Avoid floats in default duration calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-26 20:42:05 +02:00
8aa9853093
avformat/ircamenc: Avoid floats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-26 19:54:41 +02:00
894d8cf418
avformat/movenc: Avoid floats & float rounding in tmcd nb_frames calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-26 14:51:00 +02:00
f902b0b2cb
avformat/asfdec: Avoid float usage in duration calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-26 13:51:29 +02:00
db07fc2020
avformat/mpegts: Avoid float in bitrate calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-26 12:02:44 +02:00
5193407cf6
lavf/dnxhd: Autodetect more files that can be decoded.
2015-05-26 00:29:36 +02:00
83a04f8cc1
mov: reject zero bytes_per_frame with non-zero samples_per_frame
...
In this case the mov demuxer can return a large number of empty packets.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2015-05-26 00:28:02 +02:00
860ac0a5bb
lavf/riff: Add 0x729A as TwoCC for G.729.
...
Reported by forum user muchuan.
2015-05-25 23:39:56 +02:00
cf401cd12b
avformat/rmenc: Avoid floats in duration calculation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-25 13:34:43 +02:00
343654c288
avformat/mpegenc: Replace *0.7 by *7/10
...
This avoids another float computation, avoiding a potential source of
rounding issues
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-25 13:34:34 +02:00
73f7179924
avformat/mpegenc: Do not use floats for vcd_padding_bitrate
...
This reduces the risk for rounding differences.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-25 12:43:51 +02:00
8ce564ea28
avformat/mov: Mark avio context of decompressed atoms as seekable
...
Fixes Ticket4329
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-25 01:26:55 +02:00
b71528d896
mov: always check avio_read return value
...
If avio_read fails, the buffer can contain uninitialized data.
This fixes 'Conditional jump or move depends on uninitialised value(s)'
valgrind warnings.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2015-05-24 15:08:21 +02:00
8e77f8ab4a
mov: fix two memleaks
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2015-05-24 15:08:21 +02:00
a5718863da
mov: abort on EOF in ff_mov_read_chan
...
Otherwise the loop can take a lot of time if num_descr is very large.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2015-05-24 15:07:52 +02:00
0c3b4efc76
avformat/movenc: Remove float use from rgb_to_yuv()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-24 13:32:53 +02:00
28134d6a0e
avformat/swfenc: Remove another unneeded float computation
...
fewer chances for rounding differences between platforms is better
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-24 13:32:53 +02:00
5d4ff4a31e
avformat/swfenc: Remove unneeded floats
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-24 03:59:26 +02:00
17264cd281
avformat/avienc: Avoid float usage
...
reduces risk for rounding differences between platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-23 23:42:51 +02:00
3bf57acb9c
avformat/4xm: Change fps to AVRational
...
This fixes the video timebase as well
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-23 22:36:02 +02:00
ed4932a694
nutdec: fix various memleaks on failure
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2015-05-23 17:42:35 +02:00
40a3e1e9c5
avformat/wavdec: Increase dts packet threshold to fix more misdetections
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-23 16:04:19 +02:00
9f5769437a
avformat/wavdec: Increase probe_packets limit
...
Fixes DTS detection of b2429e5ba9.dts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-23 12:07:23 +02:00
0b79a389ba
nutdec: always check the get_str return value
...
If it fails, the buffers can be (partially) uninitialized.
This fixes 'Conditional jump or move depends on uninitialised value(s)'
valgrind warnings.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2015-05-23 10:36:44 +02:00
ebb0ca3d70
avformat/nutdec: Check X in 2nd branch of index reading
...
Prevents read of uninitialized variable
Based on patch by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-23 00:23:05 +02:00
3b176af001
avformat/mxfenc: Add color siting element
...
Previous version Reviewed-by: tim nicholson <nichot20@yahoo.com >
Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-22 15:30:31 +02:00
a45cf639e6
libavformat/mux: Add ff_choose_chroma_location()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-22 15:30:31 +02:00
29216d7fd1
tls: fix compilation when both gnutls and openssl are enabled
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2015-05-22 12:21:38 +03:00
e91fbfd9cf
tls: fix compilation when both gnutls and openssl are enabled
...
Signed-off-by: James Almer <jamrial@gmail.com >
2015-05-22 00:33:33 -03:00
a0124b89e3
Merge commit '94599a6de3822b13c94096d764868128f388ba28'
...
* commit '94599a6de3822b13c94096d764868128f388ba28':
tls: Remove all the local polling loops
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-22 02:49:38 +02:00
9221e362fd
Merge commit 'd13b124eaf452b267480074b2e6946538ed03a6e'
...
* commit 'd13b124eaf452b267480074b2e6946538ed03a6e':
tls: Remove the nonblocking code
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-22 02:38:11 +02:00
162644c833
Merge commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02'
...
* commit 'd15eec4d6bdfa3bd4c4b5b7dd2dbd699ba253d02':
tls: Use custom IO to read from the URLContext
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-22 02:28:27 +02:00
6b56fcbd10
WebP muxer: support a packet containing animated WebP.
...
This is the 1st patch in preparation for using WebPAnimEncoder API for encoding
and muxing WebP images.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-22 00:17:53 +02:00
94599a6de3
tls: Remove all the local polling loops
...
These aren't necessary any longer.
Signed-off-by: Martin Storsjö <martin@martin.st >
2015-05-22 00:06:11 +03:00
d13b124eaf
tls: Remove the nonblocking code
...
Since the underlying URLContext read functions are used,
they handle interruption, without having to handle it at
this level.
Signed-off-by: Martin Storsjö <martin@martin.st >
2015-05-22 00:05:01 +03:00
Michael Niedermayer