summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
* | avformat/mpl2dec: handle files with CRLF linebreaks correctlywm42013-09-03
| | | | | | | | | | | | | | | | Skip the "\r" as normal text. Otherwise it will be the first character of the string passed to sscanf(), which then fill fail to match the timestamps. Signed-off-by: Clément Bœsch <u@pkh.me>
* | avformat: H265 demuxerDirk Farin2013-09-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-03
|\| | | | | | | | | | | | | * qatar/master: movenc: Don't flush after each written packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Don't flush after each written packetMartin Storsjö2013-09-03
| | | | | | | | | | | | | | | | | | | | This should improve write performance quite significantly. --- Tested with both writing a normal mp4, by using the faststart feature and writing a fragmented mp4 file; all turn out with the same md5sum as before. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'Michael Niedermayer2013-09-03
|\| | | | | | | | | | | | | * commit '7df9e693a34c84c698da60426c78140c950f95ed': cosmetics: Fix ATRAC codec name spelling Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Fix ATRAC codec name spellingDiego Biurrun2013-09-02
| |
* | Merge commit '488b2984fece7ad0c2596826fee18e74aa904667'Michael Niedermayer2013-09-03
|\| | | | | | | | | | | | | * commit '488b2984fece7ad0c2596826fee18e74aa904667': ape demuxer: check for EOF in potentially long loops Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ape demuxer: check for EOF in potentially long loopsAnton Khirnov2013-09-02
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf'Michael Niedermayer2013-09-03
|\| | | | | | | | | | | | | * commit 'a7c1689dedd11689edb30088d467ac03f9b8d1cf': 4xm: check that bits per sample is strictly positive Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 4xm: check that bits per sample is strictly positiveAnton Khirnov2013-09-02
| | | | | | | | | | | | | | Avoids a divide by zero. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | avformat/utils: Fix bitrate overflow checkMichael Niedermayer2013-09-03
| | | | | | | | | | | | | | | | | | The check added in df33a58e5311ee9a64a573889b883a80e981af7b does not work at all, rather it broke the summing of bitrates completely. The comparission was wrong way around. This commit replaces it by a simpler and hopefully clearer check Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'df33a58e5311ee9a64a573889b883a80e981af7b'Michael Niedermayer2013-09-03
|\| | | | | | | | | | | | | * commit 'df33a58e5311ee9a64a573889b883a80e981af7b': lavf: avoid integer overflow when estimating bitrate Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: avoid integer overflow when estimating bitrateAnton Khirnov2013-09-02
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303'Michael Niedermayer2013-09-03
|\| | | | | | | | | | | | | | | | | | | * commit 'fab694dd3931b1c0bc3c598c3f88b1902c14a303': lavf: move a variable declaration to the block where it's used Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move a variable declaration to the block where it's usedAnton Khirnov2013-09-02
| |
* | riff: add 0x64 to g726 works on g726-test1.wavCompn2013-09-03
| |
* | w64dec: fix end position of summarylist guidPaul B Mahol2013-09-03
| | | | | | | | | | | | Noticed-by: James Almer Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | w64dec: fix skipping of unknown guidsPaul B Mahol2013-09-02
| | | | | | | | | | | | | | Regression since 14d50c1. Fixes #2932. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/movenc: Use the rate from av_timecode_init_from_string() for tmcdMichael Niedermayer2013-09-02
| | | | | | | | | | | | Fixes Ticket2892 Reveiwed-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9'Michael Niedermayer2013-09-01
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9': pcm_dvd: consolidate pieces from pcm.c and mpeg.c Conflicts: libavcodec/pcm.c libavcodec/version.h libavformat/mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pcm_dvd: consolidate pieces from pcm.c and mpeg.cChristian Schmidt2013-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the header decoding for PCM audio from mpeg.c and the 20/24bit parts from pcm.c and merge them into a new decoder in pcm-dvd.c. The decoder has added support for samples that span multiple packets and modified 20/24bit group decoding. Both is needed to decode samples that have been generated with DVD-Lab Pro 2. The decoding of 16bit PCM and two channel 24bit is identical to before. No other samples are known to verify the correctness of the encoding this software does. The complete list of tested formats is 48kHz/16bit/2-8 channels 48kHz/24bit/2-5 channels 96kHz/16bit/2-4 channels 96kHz/24bit/2 channels Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/utils: fix duration_fields calculation when need_parsing=0Michael Niedermayer2013-09-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/lxfdec: use a parser to parse video frame headersMichael Niedermayer2013-09-01
| | | | | | | | | | | | | | lxf needs a parser (or would need to set a few fields explicitly). Fixes Ticket2917 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: match first index and first packet size=0 handlingMichael Niedermayer2013-08-31
| | | | | | | | | | | | Fixes Ticket2861 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vformat/subtitles: check av_copy_packets return codeMichael Niedermayer2013-08-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Reinstate proper FFmpeg license for all files.Thilo Borgmann2013-08-30
| |
* | Merge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'Michael Niedermayer2013-08-29
|\| | | | | | | | | | | | | * commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa': rtmpproto: Fix limelight authentication with abbreviated app names Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Fix limelight authentication with abbreviated app namesMartin Storsjö2013-08-28
| | | | | | | | | | | | | | | | | | When streaming to limelight, the app name is either a full "appname/subaccount" or "appname/_definst_". In the latter case, the app name can be simplified into simply "appname", but the authentication hashing assumes the /_definst_ still to be present. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/ftp: fix possible crashLukasz Marek2013-08-29
| |
* | avformat/utils: fix av_probe_input_buffer2() so it returns the probe scoreMichael Niedermayer2013-08-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: export probe scoreMichael Niedermayer2013-08-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd'Michael Niedermayer2013-08-28
|\| | | | | | | | | | | | | * commit '310cc4bf82824f09bdd0b9147ed725cdbeaf9bdd': smoothstreamingenc: Write to a temp file while updating the manifest Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Write to a temp file while updating the manifestMartin Storsjö2013-08-27
| | | | | | | | | | | | | | | | If a client tries to read the file while it's being updated, the client would get an incomplete manifest. Instead write to a separate temp file and atomically rename it to replace the previous one. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'Michael Niedermayer2013-08-28
|\| | | | | | | | | | | | | * commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2': flv: Fix the help string Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Fix the help stringLuca Barbato2013-08-27
| |
* | Merge commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca'Michael Niedermayer2013-08-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f812eeda17e38797df5cb733ce99cdfd829d84ca': matroskaenc: Fix writing TRACKDEFAULTFLAG Conflicts: libavformat/matroskaenc.c tests/fate/wavpack.mak tests/ref/lavf/mkv tests/ref/seek/lavf-mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: Fix writing TRACKDEFAULTFLAGJohn Stebbins2013-08-27
| | | | | | | | | | | | | | | | The element was only being written when the value == 1. But the default value of this element is 1, so this has no useful effect. This element needs to be written when the value == 0. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-27
|\| | | | | | | | | | | | | * qatar/master: movenc: Check for errors from mov_create_chapter_track Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Check for errors from mov_create_chapter_trackMartin Storsjö2013-08-27
| | | | | | | | | | | | | | | | | | | | | | On failures in the write_trailer function, we could also ignore the errors and try to finish the file despite these errors (which would only leave an incomplete chapters track). It's probably better to signal the error clearly to the caller though (and if this function failed there's no guarantee that there's enough memory to finish the trailer either). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'Michael Niedermayer2013-08-27
|\| | | | | | | | | | | | | | | | | | | * commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242': movenc: Properly free allocated data on failures in mov_write_header Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Properly free allocated data on failures in mov_write_headerMartin Storsjö2013-08-27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe'Michael Niedermayer2013-08-27
|\| | | | | | | | | | | | | | | | | | | * commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe': movenc: Check that tracks->enc exists before trying to free extradata Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Check that tracks->enc exists before trying to free extradataMartin Storsjö2013-08-27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '4d122b01e4ce539269ee2df193b061772c7374f6'Michael Niedermayer2013-08-27
|\| | | | | | | | | | | | | * commit '4d122b01e4ce539269ee2df193b061772c7374f6': movenc: Check for allocation failures in mov_create_chapter_track Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Check for allocation failures in mov_create_chapter_trackMartin Storsjö2013-08-27
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/ftp: make const tables static constMichael Niedermayer2013-08-27
| | | | | | | | | | Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b89e8759e053792704741d08cbc41c9ac3c7ed63'Michael Niedermayer2013-08-26
|\| | | | | | | | | | | | | | | | | | | * commit 'b89e8759e053792704741d08cbc41c9ac3c7ed63': mov: Write tmcd extradata This commit should make no difference as we had tmcd support already, which is not changed. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Write tmcd extradataLuca Barbato2013-08-25
| |
* | Merge commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f'Michael Niedermayer2013-08-26
|\| | | | | | | | | | | | | | | | | | | * commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f': mov: Parse tmcd extradata Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Parse tmcd extradataLuca Barbato2013-08-25
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 14:48:56 +0000