summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-04
|\ | | | | | | | | | | | | | | | | | | * qatar/master: put_bits: Remove unused includes Conflicts: libavcodec/put_bits.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * put_bits: Remove unused includesVittorio Giovara2014-03-04
| | | | | | | | | | This requires adding includes to other files that relied on these being included implicitly.
* | Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'Michael Niedermayer2014-03-04
|\| | | | | | | | | | | | | * 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-04
| | | | | | | | This helps in disentangling lavf and lavc too.
* | Merge commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d'Michael Niedermayer2014-03-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d': vf_frei0r: refactor library loading from env variable Conflicts: configure libavfilter/vf_frei0r.c Not merged, we use av_strtok() which leads to simpler code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_frei0r: refactor library loading from env variableVittorio Giovara2014-03-04
| | | | | | | | strtok_r is not needed any more, so remove it from configure.
* | Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'Michael Niedermayer2014-03-04
|\| | | | | | | | | | | | | * commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e': vf_frei0r: prevent a segfault when filter parameters are not set Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_frei0r: prevent a segfault when filter parameters are not setVittorio Giovara2014-03-04
| |
* | Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'Michael Niedermayer2014-03-04
|\| | | | | | | | | | | | | | | | | | | * commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9': vf_frei0r: adjust error messages Conflicts: libavfilter/vf_frei0r.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_frei0r: adjust error messagesVittorio Giovara2014-03-04
| |
* | Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer2014-03-04
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * lukaszmluki/master: lavd/avdevice: add device iterators lavd: add categories to device implementations lavu/log: add device categories Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavd/avdevice: add device iteratorsLukasz Marek2014-03-03
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
| * | lavd: add categories to device implementationsLukasz Marek2014-03-03
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
| * | lavu/log: add device categoriesLukasz Marek2014-03-03
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | | avcodec/h263dec: Workaround H263 end padding bugMichael Niedermayer2014-03-04
| | | | | | | | | | | | | | | | | | Fixes: H263PaddingBugFixVID_6647.MOV Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/microdvd: export the declared frame ratewm42014-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-03
|/ / | | | | | | | | | | 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.
* | ffmpeg: dont try to run the subtitle encoder on non subtitle streamsMichael Niedermayer2014-03-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/httpauth: add comment about "" and algorithmMichael Niedermayer2014-03-03
| | | | | | | | | | 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-03
| | | | | | | | | | | | | | | | | | | | 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>
* | libutvideoenc: Add support for the new BT.709 FourCCs for YCbCrJan Ekström2014-03-03
| | | | | | | | | | | | | | | | | | | | | | | | With cli usage the decoder might have not set the colorspace during encoder init, manual colorspace override might be needed in such cases. Signed-off-by: Anton Khirnov <anton@khirnov.net> This applies commit 5de64bb3 (the source of the above commit message) to libutvideoenc as well. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: detect MPEG streams with faulty DTS and discard affected DTSMichael Niedermayer2014-03-03
| | | | | | | | | | | | Fixes issue2.ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'Michael Niedermayer2014-03-02
|\| | | | | | | | | | | | | | | | | | | * 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-02
| |
* | avcodec/hevcpred_template: also initialize top[-1] for constrained intra ↵Michael Niedermayer2014-03-02
| | | | | | | | | | | | | | | | | | prediction Fixes out of array read Fixes: 387713a12dc5cfa27fcb4178084ce1ea-asan_stack-oob_131176a_1182_cov_3861068719_CAINIT_C_SHARP_3.bit Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/g2meet: also reset local got_header when reseting the context got_headerMichael Niedermayer2014-03-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/g2meet: fix error returnsMichael Niedermayer2014-03-02
| | | | | | | | | | | | | | | | | | | | Fixes out of array accesses This should not affect any release Fixes: 8ab69af9e5a7a7e20fe04cdd25c0d6e7-asan_heap-oob_e72b82_5505_cov_2278389485_g2m4.wmv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "mpegts: do not set pts for missing dts in video streams"Michael Niedermayer2014-03-02
| | | | | | | | | | | | | | | | | | 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
* | x86/synth_filter: Revert the switch to float ops with SSE2James Almer2014-03-02
| | | | | | | | | | | | | | | | | | This reverts the changes 64672098361361cd15d37e36f747ab44de5b80ca and 68c3ed936a76c3ff7738f602fa90237ac7e3ce08 did to the SSE2 version, which generated a hit of about 5 cycles. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggparsevorbis: check packet size before reading new_len from itMichael Niedermayer2014-03-02
| | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-02
|\| | | | | | | | | | | | | | | * qatar/master: ituh263: reject b-frame with pp_time = 0 See: bb01be80462adcf4900c925e25bc644e512a4b7b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ituh263: reject b-frame with pp_time = 0Keiji Costantini2014-03-01
| | | | | | | | | | | | | | | | | | Avoid a division by 0 in ff_mpeg4_set_one_direct_mv. Sample-Id: 00000168-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | x86/synth_filter: add synth_filter_avxJames Almer2014-03-02
| | | | | | | | | | | | | | | | | | Sandy Bridge Win64: 180 cycles on ff_synth_filter_inner_sse2 150 cycles on ff_synth_filter_inner_avx Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3dec: optimize mp3_seek() for dir < 0Michael Niedermayer2014-03-02
| | | | | | | | | | | | 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-01
| | | | | | | | | | | | This reduces the number of protocol seeks Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: factorize buffer_size outMichael Niedermayer2014-03-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | RELEASE: update for 2.2Michael Niedermayer2014-03-01
| | | | | | | | | | Found-by: Timothy Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/synth_filter: add synth_filter_sseJames Almer2014-03-01
| | | | | | | | | | | | | | Build only on x86_32 targets. Signed-off-by: James Almer <jamrial@gmail.com> 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-01
| | | | | | | | | | | | | | the segments. Fixes bug #3376. Signed-off-by: Senthilnathan M <senthil.codr@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-01
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: qt-faststart: Add a note about the -movflags +faststart feature Conflicts: tools/qt-faststart.c See: 2574d62d0dd34df762aa2d80c7d6381918a80ed1 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Add a note about the -movflags +faststart featureLou Logan2014-03-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6'Michael Niedermayer2014-03-01
|\| | | | | | | | | | | | | | | | | * commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6': qt-faststart: Avoid unintentionally sign extending BE_32 See: 582f36ca3fb1c69dbe3478f174d36278f5dd3f63 See: 69ce34c796dd2d595f3312848cf6d0c87506e0d0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Avoid unintentionally sign extending BE_32Martin Storsjö2014-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | Without this cast, the BE_32() expression is sign extended when assigned to an uint64_t, since the uint8_t|uint8_t expression is promoted to an int. Also avoid undefined behaviour when left shifting an uint8_t by 24 by casting it to an uint32_t explicitly before shifting. Based on a patch by Michael Niedermayer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8'Michael Niedermayer2014-03-01
|\| | | | | | | | | | | | | | | | | | | | | * commit 'bb95334c34d0d9abccea370ae25c4765d7764ab8': qt-faststart: Check offset_count before reading from the moov_atom buffer Conflicts: tools/qt-faststart.c See: 0ea4742341726ebe42c301bc0d6426cfa01dd134 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Check offset_count before reading from the moov_atom bufferMichael Niedermayer2014-03-01
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '63848854256a024a19435e87d6bc76fffa65e81e'Michael Niedermayer2014-03-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '63848854256a024a19435e87d6bc76fffa65e81e': qt-faststart: Check the ftello() return codes Conflicts: tools/qt-faststart.c See: 4a2297294fa269e05aa2b3fe36b2ea231caa6dca Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Check the ftello() return codesMichael Niedermayer2014-03-01
| | | | | | | | | | | | This silences a warning in the coverity static analyzer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b'Michael Niedermayer2014-03-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '03c2a66fcff9707f71ffef7e61ce5e3973220d4b': qt-faststart: Fix the signedness of variables keeping the ftello return values Conflicts: tools/qt-faststart.c See: 1838961357e38402be64c0c82a2f08e4e85a0c01 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qt-faststart: Fix the signedness of variables keeping the ftello return valuesMichael Niedermayer2014-03-01
| | | | | | | | | | | | | | | | These variables are assigned the return values of ftello, which returns an off_t, which is a signed type. On errors, ftello returns -1, thus make sure this error return value can be stored properly. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 11:55:45 +0000