a6cd817a54
avformat/msf: Also check the codec tag in probing
...
Fixes probing failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-29 19:25:01 +01:00
bb8cc89b29
Merge commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2'
...
* commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2':
protocols: make the list of protocols static
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 18:08:15 +00:00
95cdc0a5c6
avformat: Remove async from TESTPROGS
...
It is current disabled.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 17:14:56 +00:00
53025fe187
Merge commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56'
...
* commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56':
lavf: move urlcontext_child_class_next() to protocols.c
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 17:00:44 +00:00
8fd5342463
Merge commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6'
...
* commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6':
lavf: move avio_enum_protocols() to protocols.c
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 16:56:47 +00:00
9c75148e6e
Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'
...
This commit also disables the async fate test, because it
used internal APIs in a non-kosher way, which no longer
exists.
* commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d':
lavf: reorganize URLProtocols
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 16:51:10 +00:00
f1e7c42f08
Merge commit '225e84e74544062706c0159ec0737b0e1d40915f'
...
* commit '225e84e74544062706c0159ec0737b0e1d40915f':
hls: disallow opening nested files in child demuxers
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 15:50:32 +00:00
6a8d05cb4d
Merge commit 'e192cd9ce2b51c2e6919f2a78b1ce53e0024e728'
...
* commit 'e192cd9ce2b51c2e6919f2a78b1ce53e0024e728':
smoothstreamingenc: do not open the files as read+write
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 15:43:00 +00:00
48847ee357
Merge commit 'd082078a88da3b3e926197d0d2aa9fa322123b76'
...
* commit 'd082078a88da3b3e926197d0d2aa9fa322123b76':
dashenc: eliminate ffurl_* usage
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 15:41:03 +00:00
04747c5a73
Merge commit '7fbb3b5b9857276b4cd17b2a530c7e0880d2bc0a'
...
* commit '7fbb3b5b9857276b4cd17b2a530c7e0880d2bc0a':
lavf: use the io_open callbacks for files opened from open_input() as well
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 15:39:19 +00:00
14a69ae60c
Merge commit 'dc6527ed908e4d330738f139074455ffbe56a2de'
...
FATE tests have been updated to patch. They do not differ in
any meaningful way.
* commit 'dc6527ed908e4d330738f139074455ffbe56a2de':
nutenc: do not use AVCodecContext.frame_size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 15:29:43 +00:00
8c5092912b
lavf: Add pcx auto-detection.
2016-02-29 15:49:52 +01:00
c0ecc597fa
lavf/img2dec: Skip SOS when auto-detecting jpeg.
...
Improves jpeg auto-detection.
2016-02-29 11:58:16 +01:00
77524ee2dc
avformat/utils: Be slightly more tolerant with fps vs. stream timebase
...
Fixes regression with ticket2451
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-29 02:59:15 +01:00
e22bd239c0
avformat/mov: do not leak memory on ffio_read_size failure
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-02-28 23:00:45 +01:00
4840effe42
avformat/mov: merge mov_read_custom functions
...
This also fixes reading gapless metadata when the entries do not start with the
mean atom. Such samples can be found here:
https://hydrogenaud.io/index.php/topic,93310.0.html
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-02-28 23:00:45 +01:00
c66a6369e4
avformat/dashenc: Enable dash output to work when the output isn't a local file
...
Use avpriv_io_move instead of ff_rename to support more than only
the file protocol.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 22:32:28 +01:00
20e4863ab1
avformat/file: enable file_move() without unistd.h
...
it only requires the rename function from os_support.h.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 22:26:39 +01:00
22dbc1caaf
lavf/mov: downgrade sidx errors to non-fatal warnings; fixes trac #5216
2016-02-28 15:00:34 -06:00
3617e69d50
lavf/mov: fix sidx with edit lists
2016-02-28 15:00:34 -06:00
1c9215e580
lavf/mp3: Properly check return values of seeks and reads while reading the header
...
Fixes large amounts of seeking past EOF, which could be extremely
slow over a network.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-28 13:57:35 +00:00
af2568a675
avformat/Makefile: Fixed missing rawutils.o reference (required by movenc.c)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 14:43:52 +01:00
b4dcd351ec
movenc: Timecode in MP4 Although MP4 does not have a concrete specification to store timecode information, the following technical note from Apple describes a way to achieve this via timecode track, similar to how it is done for MOV files.
...
https://developer.apple.com/library/mac/technotes/tn2174/_index.html
- Enabled creation of timecode tracks for MP4 in the same way as MOV.
- Used nmhd as media information header of timecode track of MP4 instead
of gmhd used in MOV, thus avoiding tcmi also, as recommended above.
- Bypassed adding source reference field for MP4, as suggested above.
Issue: https://trac.ffmpeg.org/ticket/4704
Signed-off-by: Syed Andaleeb Roomy <andaleebcse@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 03:47:23 +01:00
a21a3c25dc
probe TrueHD in MPEGTS
2016-02-27 16:27:27 -06:00
6aac43f180
lavf/matroskadec: Process QuickTime palette per track
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-27 02:03:02 +01:00
9a27780821
lavf/movenc: Add palette to video sample description
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-27 01:28:48 +01:00
b5451d88cf
lavc: reindent a few decoders after previous commits
2016-02-26 22:15:20 +01:00
805685fffd
Kill timed SSA
2016-02-26 21:34:33 +01:00
dedcb3c5a5
lavf/mux: do not fail in case of non strictly monotonically increasing DTS values for data packets
...
Consistent with what we already do with subtitles since ac08c5c0ad
2016-02-26 10:18:09 +01:00
07eec5e721
lavf/img2dec: Skip SOF size when probing jpeg.
...
Fixes auto-detection for some resolutions.
Reported-by: Clément Bœsch
2016-02-26 09:53:29 +01:00
5870f2a1dc
Revert "Merge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0'"
...
This broke packed_maindata.mp3.mp4
Its unknown to me what this commit would have fixed
Reviewed-by: James Almer <jamrial@gmail.com >
This reverts commit 79127dbbef9fad1ce7c9
2016-02-24 21:24:38 +01:00
79b1a24b7d
Merge commit '8d918a98aa24134a043d578ef45bae363dbed9db'
...
* commit '8d918a98aa24134a043d578ef45bae363dbed9db':
rtpdec: Use the right logging context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:24:34 +00:00
79127dbbef
Merge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0'
...
* commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0':
mov: Force the full parsing of mp3
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:06:40 +00:00
f99195d56f
Merge commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364'
...
* commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364':
voc: Split ff_voc_get_packet into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:04:34 +00:00
745d0c0300
Merge commit '624e235502c5aa2d17e22dd6c0ccdf080a177310'
...
* commit '624e235502c5aa2d17e22dd6c0ccdf080a177310':
build: Introduce iso_media component
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:53:30 +00:00
34e4c588c8
Merge commit '82454c3a826bc8aa42474097784b70befd5be532'
...
* commit '82454c3a826bc8aa42474097784b70befd5be532':
build: Let the WTV demuxer select the MPEG-TS demuxer
build: Adjust mpeg4video parser dependencies
build: Fix mpegvideo component dependencies
build: Fix dependencies for components relying on H.263 data tables
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:46:10 +00:00
1a12eb4a73
Merge commit '29c2d06d67724e994980045afa055c6c34611b30'
...
* commit '29c2d06d67724e994980045afa055c6c34611b30':
cosmetics: Drop empty comment lines
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:31:44 +00:00
f6d633d726
Merge commit 'b92962436bdcfae478c8598dca397a397762eef8'
...
* commit 'b92962436bdcfae478c8598dca397a397762eef8':
mov: Fix the format specifier type for size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:21:17 +00:00
e1c15a9475
img2dec: Support Progressive JPEG in jpeg_probe
...
There can be multiple SOS markers, so do not return 0 in that case.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 14:51:12 +00:00
14f7a3d55a
lavc/lavf: transmit stream_id information for mpegts KLV data packets
...
This allows to copy information related to the stream ID from the demuxer
to the muxer, thus allowing for example to retain information related to
synchronous and asynchronous KLV data packets. This information is used
in the muxer when remuxing to distinguish the two kind of packets (if the
information is lacking, data packets are considered synchronous).
The fate reference changes are due to the use of
av_packet_merge_side_data(), which increases the size of the output
packet size, since side data is merged into the packet data.
2016-02-23 18:44:12 +01:00
3ba57bfe8d
lavf/riffenc: Handle AV_PIX_FMT_MONOBLACK
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-23 17:58:52 +01:00
832a202c47
protocols: make the list of protocols static
...
Disallow other code to touch it directly, now it's only accessible
through a blacklisting/whitelisting function.
2016-02-22 11:35:57 +01:00
7d61dc95d7
lavf: move urlcontext_child_class_next() to protocols.c
...
It needs to access the list of protocols directly, so it more properly
belongs there.
2016-02-22 11:35:52 +01:00
0fa00d0591
lavf: move avio_enum_protocols() to protocols.c
...
It's a more appropriate place for it.
2016-02-22 11:35:46 +01:00
2758cdedfb
lavf: reorganize URLProtocols
...
Instead of a linked list constructed at av_register_all(), store them
in a constant array of pointers.
Since no registration is necessary now, this removes some global state
from lavf. This will also allow the urlprotocol layer caller to limit
the available protocols in a simple and flexible way in the following
commits.
2016-02-22 11:30:58 +01:00
225e84e745
hls: disallow opening nested files in child demuxers
2016-02-22 11:30:33 +01:00
e192cd9ce2
smoothstreamingenc: do not open the files as read+write
...
They are only written to, never read.
2016-02-22 11:30:24 +01:00
d082078a88
dashenc: eliminate ffurl_* usage
...
Now all IO should go through the IO callbacks and be interceptable by
the caller.
2016-02-22 11:29:00 +01:00
7fbb3b5b98
lavf: use the io_open callbacks for files opened from open_input() as well
...
There is no real reason to treat them differently.
2016-02-22 11:28:35 +01:00
dc6527ed90
nutenc: do not use AVCodecContext.frame_size
...
It will in general not be available. Use block_align if known or fall
back to av_get_audio_frame_duration().
2016-02-22 11:28:00 +01:00
Michael Niedermayer