Michael Niedermayer
8cc581fbf7
Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'
...
* commit '5397386effba2e53e4ff82852a86f6be4d59e9c1':
mathops: move macro to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04 13:38:04 +01:00
Vittorio Giovara
5397386eff
mathops: move macro to the only place it is used
...
This helps in disentangling lavf and lavc too.
2014-03-04 11:45:31 +01:00
wm4
b416517cce
avformat/microdvd: export the declared frame rate
...
MicroDVD files are normally frame-based (i.e. there are no absolute
timestamps), but can have an optional frame rate header. If this
header is missing, the timestamps depend on the frame rate of the
video they were created for.
The demuxer will use a fallback frame rate if it's missing from the
header. Currently, applications using libavformat can't know whether
the time base is based on the fallback value, or if a frame rate
header was present.
This commit introduces a subfps AVOption for MicroDVD, and the
demuxer sets it if and only if a frame rate header was present.
Signed-off-by: Clément Bœsch <u@pkh.me>
2014-03-03 23:33:47 +01:00
wm4
0786598f51
avformat/microdvd: skip BOM properly
...
The BOM is already skipped in the probe function, but not the header
read function. This could cause the header to be misparsed, such as
not interpreting the FPS line.
2014-03-03 23:26:27 +01:00
Michael Niedermayer
ab5d46df16
avformat/httpauth: add comment about "" and algorithm
...
Suggested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-03 17:04:57 +01:00
Willy Aubry
65c95de213
avformat/HLS: modified EXT-X-MEDIA-SEQUENCE header in order to follow the HLS standard
...
When using the wrap option the EXT-X-MEDIA-SEQUENCE header of the playlist file was reset instead of being incremented.
It is now incremented by one for every media URI removed from the playlist file as the standard states.
Signed-off-by: Willy Aubry <waubry@viotech.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-03 16:46:22 +01:00
Michael Niedermayer
2dcaa1b9d1
avformat/utils: detect MPEG streams with faulty DTS and discard affected DTS
...
Fixes issue2.ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-03 02:27:07 +01:00
Michael Niedermayer
411f8f4c9a
Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'
...
* commit '5c9c305d14730faf2af206e5d519df4948de0ed2':
ass: K&R formatting cosmetics
Conflicts:
libavformat/assdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-02 21:44:44 +01:00
Patrice Clement
5c9c305d14
ass: K&R formatting cosmetics
2014-03-02 13:23:13 +01:00
Michael Niedermayer
0bf882864e
Revert "mpegts: do not set pts for missing dts in video streams"
...
This reverts commit f65afef1df
.
If only pts is coded then dts must be equal pts
See Rec. ITU-T H.222.0 (06/2012) / ISO/IEC 13818-1:2013 (E) 2.7.5
Found-by: Baptiste Coudurier
2014-03-02 13:12:31 +01:00
Michael Niedermayer
f5d1d1e466
avformat/oggparsevorbis: check packet size before reading new_len from it
...
Fixes out of array read
Fixes: 34260c7981118fb38fba61809bf4dd5a-asan_heap-oob_93b923_1508_cov_951051643_DivX640x480_oggvorbis.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-02 05:13:29 +01:00
Michael Niedermayer
52a2138656
avformat/avidec: Use a buffer with sufficient padding in read_gab2_sub()
...
Fixes out of array read
Fixes: 0ff9841c2a102f06e0d582bfc3376cbd-asan_heap-oob_495589_6836_cov_1763916974_mewmew_ssa.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-02 04:38:30 +01:00
Michael Niedermayer
171dd67520
avformat/mp3dec: optimize mp3_seek() for dir < 0
...
this minimizes the amount of protocol seeks and reading needed in that case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-02 00:20:31 +01:00
Michael Niedermayer
9600486d10
avformat/aviobuf: optimize sequential backward seeking
...
This reduces the number of protocol seeks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-01 23:57:40 +01:00
Michael Niedermayer
2adf422ce2
avformat/aviobuf: factorize buffer_size out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-01 23:27:37 +01:00
Senthilnathan M
561bfce203
HLS: Handle the case when hls_list_size=0. Playlist file should contain all the segments. Fixes bug #3376 .
...
Signed-off-by: Senthilnathan M <senthil.codr@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-01 15:13:23 +01:00
Michael Niedermayer
0c9dd939cd
avformat/ac3dec: Use avpriv_ac3_parse_header2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-01 01:56:25 +01:00
Lukasz Marek
9f4b55ef49
lavf/ftp: fix seek to nagative position
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-02-28 00:07:31 +01:00
Lukasz Marek
0025f13005
lavf/libssh: fix seek to nagative position
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-02-28 00:04:29 +01:00
Carl Eugen Hoyos
3ba056017f
Fix http authentication.
...
Add parenthesis around "MD5" in the request string as required by
RFC 2069.
Fixes ticket #3417 .
Reported and tested by Haarman
Analyzed-by: Eugen-Andrei Gavriloaie
2014-02-27 16:56:30 +01:00
Michael Niedermayer
622d24e4eb
avformat/mov: simplify code setting needs_parsing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-27 13:52:55 +01:00
Paul B Mahol
9d297641ee
avformat/sdr2: h264 stream needs parsing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-02-26 17:46:45 +00:00
Carl Eugen Hoyos
96fc2908f0
Read bits_per_coded_sample from V_MS/VFW/FOURCC mkv files.
...
Fixes ticket #3425 .
2014-02-26 00:02:51 +01:00
Michael Niedermayer
a908de7f49
avformat/options_table: add named constants for avoid_negative_ts
...
Idea-by: ubitux
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 19:46:11 +01:00
James Almer
313a6c65b7
oggdec: validate VP8 keyframes
...
Fixes seeking with broken files
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 02:24:21 +01:00
Carl Eugen Hoyos
5d6fac114b
Support old qclp-in-mov files that do not store bytes_per_frame in the header.
...
Fixes ticket #2649 .
2014-02-23 00:41:53 +01:00
Carl Eugen Hoyos
0aded6bf02
Support MPEG-2 video mov files with sample description mp2v.
2014-02-23 00:31:50 +01:00
Michael Niedermayer
717ec57c7e
avformat/movenc: shift positive timestamps to 0 if edit lists cannot be used
...
Fix handling of timestamps which start far away from 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 22:39:50 +01:00
Michael Niedermayer
a89c012531
avformat/mux: support shifting timestamps so they start at 0
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 22:39:49 +01:00
Peter Ross
55479f42ce
avformat/nut: add bayer colorspaces
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 20:51:13 +01:00
Michael Niedermayer
3c096751ff
avformat/utils: compute_pkt_fields: Fix DTS for the case where has_b_frames is too large but the correct one is constant
...
Fixes issue1.m2ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 14:31:23 +01:00
Michael Niedermayer
d4dfa97ae3
avformat/utils: reset pts_buffer in estimate_timings_from_pts()
...
This fixes the first few dts after find_stream_info
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 14:31:23 +01:00
Michael Niedermayer
f288e1b67c
avformat/utils: factorize h264/hevc checks out in compute_pkt_fields()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-22 14:31:23 +01:00
Paul B Mahol
8bcacd9f42
SDR2 demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-02-22 11:40:27 +00:00
Carl Eugen Hoyos
f5fe6a4f79
Do not warn about missing start time for unknown streams.
2014-02-21 17:27:37 +01:00
Carl Eugen Hoyos
1f7e9be0b0
Only complain about missing frame rate for video streams.
2014-02-21 17:27:20 +01:00
Tomas Härdin
c416b5cdf1
mxf: Add DNxHD UL
...
Note that the old DNxHD UL is actually JPEG 2000 according to RP224.
Leaving it as-is for now.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-02-21 15:46:10 +01:00
Philip de Nier
a9099e0402
mxf: Add uncompressed 422 8-bit rawvideo UL
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-02-21 15:46:05 +01:00
Michael Niedermayer
20fa3fb93d
avformat/movenc: assert that get_cluster_duration() value is valid
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 04:41:21 +01:00
Michael Niedermayer
1b872de8f4
avformat/movenc: check that the input timestamps are within the range that can be stored in mov
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-21 04:41:21 +01:00
Michael Niedermayer
0c803eba2f
avformat/mov: make invalid sampledelta error more verbose
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 18:04:44 +01:00
Nicolas George
916a79227e
lavf/mux: check av_dup_packet() return value.
...
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 02:58:39 +01:00
Michael Niedermayer
c849b00b80
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libavformat/mpegts: expose raw packet size
Conflicts:
libavformat/mpegts.c
See: f9b997c337
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 02:10:05 +01:00
Leandro Dorileo
8370a6fa59
libavformat/mpegts: expose raw packet size
...
We cannot easily determine if an mpeg TS's packet size is DVHS, FEC
or so on, for that we need to expose the internal raw_packet_size
field.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-02-19 21:52:17 +01:00
Michael Niedermayer
2969fb4393
avformat/utils: av_guess_frame_rate() favor avg_frame_rate if r_frame_rate has a comparably unlikely value
...
Fixes Ticket3399
Fixes Ticket2958
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-19 18:40:27 +01:00
Michael Niedermayer
3f461566b7
avformat/movenc: simplify code, decrease difference to libav
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-19 14:20:22 +01:00
Michael Niedermayer
ef1aae6ea9
Merge commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66'
...
* commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66':
movenc: Add a fallback fragmentation method for plain mp4 as well
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-19 14:19:45 +01:00
Martin Storsjö
1e142d5b48
movenc: Add a fallback fragmentation method for plain mp4 as well
...
Previously the default fragmentation method was only enabled
if writing an ISM file.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-02-19 09:58:14 +02:00
Michael Niedermayer
c57fc97e95
avformat/bink: Check return value of av_add_index_entry()
...
Fixes null pointer dereference
Fixes: cdbf15cbd0a27cee958dd0b8800e452e-signal_sigsegv_737991_2083_cov_317652874_LBSTART.BIK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-17 23:47:05 +01:00
Michael Niedermayer
6742614c23
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doxygen: Replace @parblock syntax with manual linebreaks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-17 21:26:59 +01:00