summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avformat/asfdec_f: Add ASFDataType, use named types for metadataJohn Adlum2015-07-02
| | | | | | This is based on asfdec_o.c, but uses a proper type instead of defines Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/asfdec_f: Use dynamic allocation in asf_read_metadata() instead of ↵John Adlum2015-07-02
| | | | | | a fixed size buffer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/asfdec_f: factor error checking out of main header parsing loopJohn Adlum2015-07-02
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: Redesign scoring in av_find_default_stream_index()Michael Niedermayer2015-07-01
| | | | | | | | | | This avoids empty streams from being selected if a equivalent non empty one is available The new system is also clearer and more systematic This may need finetuning, which should be easy to do ... Fixes Ticket2687 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/rtmpproto: increase hardcoded url/path lengthsPaul B Mahol2015-07-01
| | | | | | Fixes #4103. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/asfdec_f: Assert that packet positions match in asf_read_pts()John Adlum2015-07-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/asfdec_f: Correct skip to key codeJohn Adlum2015-07-01
| | | | | | Fixes Ticket3978 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/concatdec: copy stream metadata when using concatVadim Belov2015-07-01
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/nutdec: Check ff_gen_search() for failureMichael Niedermayer2015-07-01
| | | | | | | Fixes assertion failure Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/matroskadec: Fix undefined shift in read_sint()Michael Niedermayer2015-07-01
| | | | | | | Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'Michael Niedermayer2015-07-01
|\ | | | | | | | | | | | | | | | | | | * commit 'a1e2caa93e4f8102666a21222f01b74838b6497f': mov: Log format rather than fourcc in stsd in trace mode Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Log format rather than fourcc in stsd in trace modeVittorio Giovara2015-07-01
| | | | | | | | This will fix remaining format warnings.
* | Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1'Michael Niedermayer2015-07-01
|\| | | | | | | | | | | | | * commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1': mov: Adjust variable types to fix format warnings Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Adjust variable types to fix format warningsVittorio Giovara2015-07-01
| |
* | Merge commit 'df22e30172b09cda4d6f7d4f43508284be65848a'Michael Niedermayer2015-07-01
|\| | | | | | | | | | | | | * commit 'df22e30172b09cda4d6f7d4f43508284be65848a': dump: Use the correct abs() version Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: Use the correct abs() versionVittorio Giovara2015-07-01
| | | | | | | | | | | | Fix warning from clang "absolute value function 'abs' given an argument of type 'long long' but has parameter of type 'int' which may cause truncation of value [-Wabsolute-value]".
* | Merge commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a'Michael Niedermayer2015-06-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e95c7a61852cc5b9ce5445ff034b87553e61958a': mov: Preserve the metadata even when bit-exactness is requested Conflicts: libavformat/movenc.c tests/ref/vsynth/vsynth1-mpeg4 tests/ref/vsynth/vsynth2-mpeg4 See: a17ee4117dcb2922f57da33b8401d11b06e81cba Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Preserve the metadata even when bit-exactness is requestedLuca Barbato2015-06-30
| | | | | | | | | | | | | | Make sure to not write the custom `encoder` string in that case. Bug-Id: 845 CC: libav-stable@libav.org
* | Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'Michael Niedermayer2015-06-30
|\| | | | | | | | | | | | | | | | | | | * commit '42bc768e5240ec01237ad2eb7c69b917158de258': mpegts: Add jpeg2000 stream type Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Add jpeg2000 stream typeJohn Högberg2015-06-30
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501'Michael Niedermayer2015-06-30
|\| | | | | | | | | | | | | | | | | | | * commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501': riff: Validate the wav header size before trying to parse it Conflicts: libavformat/riffdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Validate the wav header size before trying to parse itLuca Barbato2015-06-28
| |
* | Merge commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68'Michael Niedermayer2015-06-30
|\| | | | | | | | | | | | | * commit '5bdfc17189e4ea63c6b46b6d5256852fcb409d68': asf: Do not skip data streams Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asf: Do not skip data streamsLuca Barbato2015-06-28
| |
* | Rename asfdec-o.c to asfdec_o.cMichael Niedermayer2015-06-30
| | | | | | | | | | | | Most files use _ instead of - as spacer, so this is more consistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: rename asfdec.c to asfdec_f.cMichael Niedermayer2015-06-30
| | | | | | | | | | | | leaving it as asfdec.c confuses git Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2015-06-29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp. lavf/mpegts: Return 0 if the probe function does not detect mpegts. lavf/img2dec: Improve detection of valid Quickdraw images. lavf/asfdec: Reduce minimum header size. Changelog: Add jpeg 2000 improvements before they get forgotten. lavf/img2dec: Autodetect dds frames. Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp.Carl Eugen Hoyos2015-06-29
| | | | | | | | | | | | Reduces console spamming on debug level.
| * | lavf/mpegts: Return 0 if the probe function does not detect mpegts.Carl Eugen Hoyos2015-06-29
| | | | | | | | | | | | Reduces console spamming on debug level.
| * | lavf/img2dec: Improve detection of valid Quickdraw images.Carl Eugen Hoyos2015-06-29
| | | | | | | | | | | | | | | Detect Quickdraw images without application header with lower score.
| * | lavf/asfdec: Reduce minimum header size.Carl Eugen Hoyos2015-06-29
| | | | | | | | | | | | Fixes GipsyGuitar.wmv mentioned in ticket #1477.
| * | lavf/img2dec: Autodetect dds frames.Carl Eugen Hoyos2015-06-29
| | |
* | | avformat/avio: Move avio_delete() avio_move() to avpriv_ namespaceMichael Niedermayer2015-06-29
|/ / | | | | | | | | | | | | | | | | This was suggested in the discussion about these functions With this change the functions are available internally but are not part of the public API Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: Allow packet_obj_size == 0Michael Niedermayer2015-06-29
| | | | | | | | | | | | Fixes Ticket3521 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: Print packet_obj_size in case it is invalidMichael Niedermayer2015-06-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | api-h264-test: build with another api testLudmila Glinskih2015-06-29
| | | | | | | | | | | | Location of api-h264-test changed to special directory for api tests. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: Print a warning if data is skiped due to less than a frame ↵Michael Niedermayer2015-06-28
| | | | | | | | | | | | header being left Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: Reduce FRAME_HEADER_SIZE to 11Michael Niedermayer2015-06-28
| | | | | | | | | | | | This fixes demuxing of screen_codec.wmv Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8a26ae5f94e613dbf7eb8e3c60462e966e409cdc'Michael Niedermayer2015-06-28
|\| | | | | | | | | | | | | * commit '8a26ae5f94e613dbf7eb8e3c60462e966e409cdc': mpjpeg: Check stream allocation Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpjpeg: Check stream allocationLuca Barbato2015-06-28
| | | | | | | | Bug-Id: CID 1308152
* | Merge commit 'b08569a23948db107e5e6175cd4c695427d5339d'Michael Niedermayer2015-06-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b08569a23948db107e5e6175cd4c695427d5339d': lavf: Replace the ASF demuxer Conflicts: Changelog libavformat/asf.h libavformat/asfdec.c libavformat/version.h tests/ref/fate/wmv8-drm-nodec tests/ref/seek/lavf-asf The rewritten demuxer is placed in a new file, the current demuxer is left as default. Carl has tested both and the one working better is default. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Replace the ASF demuxerAlexandra Hájková2015-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old one is the result of the reverse engineering and guesswork. The new one has been written following the now-available specification. This work is part of Outreach Program for Women Summer 2014 activities for the Libav project. The fate references had to be changed because the old demuxer truncates the last frame in some cases, the new one handles it properly. The seek-test reference is changed because seeking works differently in the new demuxer. When seeking, the packet is not read from the stream directly, but it is rather constructed by the demuxer. That is why position is -1 now in the reference. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/riffdec: Forward error code from avio_read() in ff_get_guid()Michael Niedermayer2015-06-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutdec: check maxpos in read_sm_data before returning successAndreas Cadhalpun2015-06-27
| | | | | | | | | | | | | | | | Otherwise sm_size can be larger than size, which results in a negative packet size. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | lavf/brstm: if the file lies about the last block's size, correct itRodger Combs2015-06-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: do not iterate to next sequence number if interruption is ↵schenk michael2015-06-26
| | | | | | | | | | | | requested Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/brstm: expose the loop point when presentRodger Combs2015-06-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | electronicarts: demux alpha streamPeter Ross2015-06-25
| | | | | | | | | | | | | | | | | | Electronic Arts VP6 files may contain two video streams: one for the primary video stream and another for the alpha mask. The file format uses identical data structures for both streams. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | electronicarts: move video stream properties into dedicated structurePeter Ross2015-06-25
| | | | | | | | | | | | | | This is required for the alpha stream demux patch. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat: Add H264 API testLudmila Glinskih2015-06-25
| | | | | | | | | | | | | | Result differs in pkt_duration and time_base.den for some reason. Right now it tests only one example (adjusted to match the output). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 05:19:56 +0000