summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer2014-03-062-6/+11
|\ | | | | | | | | | | | | | | | | | | * lukaszmluki/master: lavd/avdevice: always free detected devices on error lavf/http: return error from seek on invalid whence lavf/http: return error on seeking to negative postion lavf/avio: fix ffurl_alloc error checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf/http: return error from seek on invalid whenceLukasz Marek2014-03-061-0/+2
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
| * lavf/http: return error on seeking to negative postionLukasz Marek2014-03-061-4/+7
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
| * lavf/avio: fix ffurl_alloc error checksLukasz Marek2014-03-061-2/+2
| | | | | | | | | | | | | | ffurl_alloc doc says it returns >= 0 in case of success. avio treats non-zero as errors. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | http: handle ICY in presence of chunked transfer encodingwm42014-03-051-15/+39
|/ | | | | | | | | | | | | | | Some http servers send an ICY stream in combination with chunked transfer encoding. This case was handled incorrectly by the ICY code: instead of handling chunked encoding before anything ICY related, both were mixed. Fix this by separating the ICY code from normal http reading. Move the normal http reading to a new function http_read_stream(), while http_read() handles ICY on top of http_read_stream(). The server identified itself as: cloudflare-nginx Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/oggparsevorbis: dont use invalid granulesMichael Niedermayer2014-03-051-1/+1
| | | | | | Fixes Ticket3437 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mpegts: use goto out instead of break on truncated or invalid pmt tablesMarton Balint2014-03-051-4/+4
| | | | | Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Add "prefer_tcp" flag to "rtsp_flags"Andrey Utkin2014-03-042-0/+6
| | | | | | | If set, and if TCP is available as RTSP RTP transport, then TCP will be tried first as RTP transport. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '3407172b36a93cec410c6a287dbeec0f41257512'Michael Niedermayer2014-03-041-209/+219
|\ | | | | | | | | | | | | | | | | | | * commit '3407172b36a93cec410c6a287dbeec0f41257512': avienc: K&R formatting cosmetics Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avienc: K&R formatting cosmeticsKeiji Costantini2014-03-041-194/+205
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/mpegtsenc: fix HEVC MPEG TS stream typeolugbone2014-03-042-0/+4
| | | | | | | | | | | | Allowing HEVC video using TS stream type 0x24 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'Michael Niedermayer2014-03-041-1/+7
|\ \ | |/ | | | | | | | | | | * commit '5397386effba2e53e4ff82852a86f6be4d59e9c1': mathops: move macro to the only place it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mathops: move macro to the only place it is usedVittorio Giovara2014-03-041-1/+7
| | | | | | | | This helps in disentangling lavf and lavc too.
* | avformat/microdvd: export the declared frame ratewm42014-03-032-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | avformat/microdvd: skip BOM properlywm42014-03-031-3/+10
| | | | | | | | | | | | 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.
* | avformat/httpauth: add comment about "" and algorithmMichael Niedermayer2014-03-031-0/+3
| | | | | | | | | | Suggested-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/HLS: modified EXT-X-MEDIA-SEQUENCE header in order to follow the ↵Willy Aubry2014-03-031-1/+6
| | | | | | | | | | | | | | | | | | | | 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>
* | avformat/utils: detect MPEG streams with faulty DTS and discard affected DTSMichael Niedermayer2014-03-032-0/+32
| | | | | | | | | | | | Fixes issue2.ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'Michael Niedermayer2014-03-021-10/+10
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '5c9c305d14730faf2af206e5d519df4948de0ed2': ass: K&R formatting cosmetics Conflicts: libavformat/assdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ass: K&R formatting cosmeticsPatrice Clement2014-03-021-46/+49
| |
| * mxf: Add DNxHD ULTomas Härdin2014-02-211-0/+1
| | | | | | | | | | | | | | 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>
| * mxf: Add uncompressed 422 8-bit rawvideo ULPhilip de Nier2014-02-211-0/+1
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Revert "mpegts: do not set pts for missing dts in video streams"Michael Niedermayer2014-03-021-4/+1
| | | | | | | | | | | | | | | | | | This reverts commit f65afef1df49f53e14c8d4173ff960fff8d44ecb. 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
* | avformat/oggparsevorbis: check packet size before reading new_len from itMichael Niedermayer2014-03-021-1/+1
| | | | | | | | | | | | | | 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>
* | avformat/avidec: Use a buffer with sufficient padding in read_gab2_sub()Michael Niedermayer2014-03-021-3/+11
| | | | | | | | | | | | | | 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>
* | avformat/mp3dec: optimize mp3_seek() for dir < 0Michael Niedermayer2014-03-021-0/+2
| | | | | | | | | | | | this minimizes the amount of protocol seeks and reading needed in that case Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: optimize sequential backward seekingMichael Niedermayer2014-03-011-1/+12
| | | | | | | | | | | | This reduces the number of protocol seeks Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: factorize buffer_size outMichael Niedermayer2014-03-011-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | HLS: Handle the case when hls_list_size=0. Playlist file should contain all ↵Senthilnathan M2014-03-011-2/+2
| | | | | | | | | | | | | | the segments. Fixes bug #3376. Signed-off-by: Senthilnathan M <senthil.codr@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/ac3dec: Use avpriv_ac3_parse_header2()Michael Niedermayer2014-03-011-8/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/ftp: fix seek to nagative positionLukasz Marek2014-02-281-3/+5
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | lavf/libssh: fix seek to nagative positionLukasz Marek2014-02-281-0/+5
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | Fix http authentication.Carl Eugen Hoyos2014-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | 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
* | avformat/mov: simplify code setting needs_parsingMichael Niedermayer2014-02-271-4/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/sdr2: h264 stream needs parsingPaul B Mahol2014-02-261-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Read bits_per_coded_sample from V_MS/VFW/FOURCC mkv files.Carl Eugen Hoyos2014-02-261-0/+4
| | | | | | | | Fixes ticket #3425.
* | avformat/options_table: add named constants for avoid_negative_tsMichael Niedermayer2014-02-241-1/+5
| | | | | | | | | | | | | | 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>
* | oggdec: validate VP8 keyframesJames Almer2014-02-241-2/+10
| | | | | | | | | | | | | | Fixes seeking with broken files Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support old qclp-in-mov files that do not store bytes_per_frame in the header.Carl Eugen Hoyos2014-02-231-0/+4
| | | | | | | | Fixes ticket #2649.
* | Support MPEG-2 video mov files with sample description mp2v.Carl Eugen Hoyos2014-02-231-0/+1
| |
* | avformat/movenc: shift positive timestamps to 0 if edit lists cannot be usedMichael Niedermayer2014-02-221-1/+1
| | | | | | | | | | | | Fix handling of timestamps which start far away from 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mux: support shifting timestamps so they start at 0Michael Niedermayer2014-02-222-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nut: add bayer colorspacesPeter Ross2014-02-221-0/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: compute_pkt_fields: Fix DTS for the case where has_b_frames ↵Michael Niedermayer2014-02-222-4/+53
| | | | | | | | | | | | | | | | is too large but the correct one is constant Fixes issue1.m2ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: reset pts_buffer in estimate_timings_from_pts()Michael Niedermayer2014-02-221-0/+4
| | | | | | | | | | | | This fixes the first few dts after find_stream_info Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: factorize h264/hevc checks out in compute_pkt_fields()Michael Niedermayer2014-02-221-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | SDR2 demuxerPaul B Mahol2014-02-223-0/+122
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Do not warn about missing start time for unknown streams.Carl Eugen Hoyos2014-02-211-1/+3
| |
* | Only complain about missing frame rate for video streams.Carl Eugen Hoyos2014-02-211-0/+1
| |
* | avformat/movenc: assert that get_cluster_duration() value is validMichael Niedermayer2014-02-211-1/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud