aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce'Michael Niedermayer2015-05-121-1/+1
|\| | | | | | | | | | | | | | | * commit 'da5c6a97bbfe34d4b30a89e72150dd400299ddce': riff: Add MultiScope II fourcc MSC2 as MJPEG See: e31cdb5cc8080e164c66838a69f37f60f2d0ea82 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add MultiScope II fourcc MSC2 as MJPEGCarl Eugen Hoyos2015-05-121-0/+1
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/internal: Fix warning about struct declarationMichael Niedermayer2015-05-122-3/+3
| | | | | | | | | | | | Moving ffio_open2_wrapper() to internal as it uses AVFormatContext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mlvdec: Use AVFormatContext->open_cb()Michael Niedermayer2015-05-111-1/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avformat: slightly more verbose documentation for open_cb()Michael Niedermayer2015-05-111-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Use open_cb() if setMichael Niedermayer2015-05-111-3/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: add callback for opening further filesMichael Niedermayer2015-05-115-1/+32
| | | | | | | | | | Previous version reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | id3v2: catch avio_read errors in check_tagAndreas Cadhalpun2015-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since len is an unsigned int, the comparison is currently treated as unsigned and thus ignores all errors from avio_read. Thus cast len to int, which is unproblematic, because at that point len is between 0 and 4. This fixes 'Conditional jump or move depends on uninitialised value' valgrind warnings in is_tag. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Pass MovContext into mov_open_dref()Michael Niedermayer2015-05-111-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/vorbiscomment: Use 64bit int for ff_vorbiscomment_length()Michael Niedermayer2015-05-112-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskaenc: Check ff_vorbiscomment_length in put_flac_codecpriv()Michael Niedermayer2015-05-111-1/+4
| | | | | | | | | | | | Its currently guaranteed to be smaller but its safer to check anyway Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggenc: Check ff_vorbiscomment_length in ogg_write_vorbiscomment()Michael Niedermayer2015-05-111-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/flacenc: Check length in flac_write_block_comment()Michael Niedermayer2015-05-111-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/vorbiscomment: Check entry length in ff_vorbiscomment_write()Michael Niedermayer2015-05-111-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/subtitles: Use size_t for lenMichael Niedermayer2015-05-112-3/+3
| | | | | | | | | | | | | | string length could theoretically be larger than int Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: Use size_t for the variable holding a strlen() value.Michael Niedermayer2015-05-111-1/+1
| | | | | | | | | | | | Should make no difference but is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/url: Use size_t for len from strlen()Michael Niedermayer2015-05-111-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd'Michael Niedermayer2015-05-111-2/+4
|\| | | | | | | | | | | | | * commit 'b8d2630c5327d2818d05c8a48be0417905d8e0fd': dashenc: Reduce the segment duration if cutting out parts with edit lists Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Reduce the segment duration if cutting out parts with edit listsMartin Storsjö2015-05-101-2/+4
| | | | | | | | | | | | | | | | This makes sure that the time + duration of the first segment matches the start time of the next segment for e.g. AAC audio with encoder delay. Signed-off-by: Martin Storsjö <martin@martin.st>
| * dashenc: replace attribute id with contentType for the AdaptationSet elementJames Almer2015-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | id should be an integer, not a string. It is also optional, so use contentType instead which is the proper attribute for these values. This fixes an MPD validation error. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | dashenc: replace attribute id with contentType for the AdaptationSet elementJames Almer2015-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | id should be an integer, not a string. It is also optional, so use contentType instead which is the proper attribute for these values. This addresses ticket #4545, fixing an MPD validation error. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea'Michael Niedermayer2015-05-101-0/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit '379e5603f4131e677ecf5ba79973dcd5603f28ea': id3v2: Do not export empty APIC description Conflicts: libavformat/id3v2.c See: b697b297b77f73c932307120e32c187d521d2ff7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2: Do not export empty APIC descriptionwm42015-05-091-1/+4
| | | | | | | | | | | | APIC tags always have a description. Tag writers obviously leave it empty if there is no description. In this case, libavformat would export "" as title. Do not set the title instead.
* | Merge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29'Michael Niedermayer2015-05-101-21/+20
|\| | | | | | | | | | | | | | | | | | | | | * commit '254f3daba4271c1918d9a7ad155b1442ef93ed29': nut: Make sure to clean up on read_header failure Conflicts: libavformat/nutdec.c See: 361702660d2c37a63b7d6381d39e1e1de8405260 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: Make sure to clean up on read_header failureLuca Barbato2015-05-091-17/+22
| | | | | | | | | | | | Based on Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> work. CC: libav-stable@libav.org
* | Merge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81'Michael Niedermayer2015-05-101-3/+17
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81': avi: Validate sample_size Conflicts: libavformat/avidec.c See: ca234639ac49a0dc073ac1f10977979acdb94f97 See: c7369f3a4bd21ea64571c1b0c4fcbf39f8daf68c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avi: Validate sample_sizeAndreas Cadhalpun2015-05-091-0/+17
| | | | | | | | | | | | | | And either error out or set it to 0 if it is negative. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'Michael Niedermayer2015-05-101-1/+1
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b34257eefd98cb768ea2f53a390b8684d51e689a': nut: Check chapter creation in decode_info_header Conflicts: libavformat/nutdec.c See: 3ff1af2b0db7132d5717be6395227a94c8abab07 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: Check chapter creation in decode_info_headerAndreas Cadhalpun2015-05-081-0/+4
| | | | | | | | | | | | | | | | This fixes a segmentation fault when accessing the metadata. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> CC: libav-stable@libav.org
| * mux: Do not leave stale side data pointers in ff_interleave_add_packet()Michael Niedermayer2015-05-061-0/+2
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/wavenc: Check umid lengthMichael Niedermayer2015-05-101-1/+1
| | | | | | | | | | | | Fixes potential out of array read Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wavenc: fix string length variable typesMichael Niedermayer2015-05-101-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nutenc: Fix writing strings larger than 2gbMichael Niedermayer2015-05-101-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/http: Mark lower_proto as const in http_listen()Michael Niedermayer2015-05-101-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxf: Always evaluate PRINT_KEY() arguments at compile timeMichael Niedermayer2015-05-101-1/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxf: Simplify PRINT_KEY()Michael Niedermayer2015-05-101-10/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat_alloc_context: initialize raw_packet_buffer_remaining_size.Reimar Döffinger2015-05-101-0/+1
| | | | | | | | | | | | | | | | This currently works for most users because avformat_open_input sets it, but this patch fixes any applications not using that function. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | id3v2: do not export APIC description if emptywm42015-05-081-1/+2
| | | | | | | | | | | | | | | | APIC tags always have a description. Tag writers obviously leave it empty if there is no description. In this case, libavformat would export "" as title. Do not set the title instead. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/img2dec: Autodetect qdraw images.Carl Eugen Hoyos2015-05-074-2/+15
| |
* | avformat/internal: always check arguments of hex_dump_debug()Michael Niedermayer2015-05-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/asfdec: do not define print_guid() to nothingMichael Niedermayer2015-05-071-1/+1
| | | | | | | | | | | | This avoid potential warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6c8c7c246280cdcd23e4d99006b95245ae837278'Michael Niedermayer2015-05-061-0/+47
|\| | | | | | | | | | | | | * commit '6c8c7c246280cdcd23e4d99006b95245ae837278': dump: Print AVAudioServiceType side data Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: Print AVAudioServiceType side dataVittorio Giovara2015-05-061-0/+47
| |
* | Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'Michael Niedermayer2015-05-061-0/+3
|\| | | | | | | | | | | | | | | | | | | * commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d': lavf: Open PICT images with Quickdraw Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Open PICT images with QuickdrawVittorio Giovara2015-05-061-0/+3
| | | | | | | | | | Update the pictor test to use the pictor codec, as both formats share the .pic file extension.
* | lavf/riff: Add MultiScope II fourcc MSC2 as MJPEG.Carl Eugen Hoyos2015-05-051-0/+1
| |
* | avformat/matroskaenc: Use avoid_negative_ts_use_pts if no stream writes dtsMichael Niedermayer2015-05-051-1/+4
| | | | | | | | | | | | | | | | This reduces the number of cases where timestamps need to be shifted Fixes Ticket4487 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mux: Add avoid_negative_ts_use_ptsMichael Niedermayer2015-05-052-12/+26
| | | | | | | | | | | | This allows using pts instead of dts for negative TS avoidance Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: print a warning for negative sample_sizeMichael Niedermayer2015-05-051-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: avoid infinite loop due to negative ast->sample_sizeAndreas Cadhalpun2015-05-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | If max in clean_index is set to a negative ast->sample_size, the following loop never ends: while (max < 1024) max += max; Thus set ast->sample_size to 0 if it would otherwise be negative. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 16:25:02 +0000