summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mpegts: use goto out instead of break on truncated or invalid pmt tablesMarton Balint2014-03-051-4/+4
| | | | | Signed-off-by: Marton Balint <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* x86/synth_filter: add synth_filter_fma3James Almer2014-03-052-17/+15
| | | | | Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* Add "prefer_tcp" flag to "rtsp_flags"Andrey Utkin2014-03-043-0/+8
| | | | | | | 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 <[email protected]>
* x86/synth_filter: add missing HAVE_YASM guardJames Almer2014-03-041-0/+4
| | | | | | | Should fix compilation failures with --disable-yasm on some compilers Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* Merge commit '3407172b36a93cec410c6a287dbeec0f41257512'Michael Niedermayer2014-03-041-209/+219
|\ | | | | | | | | | | | | | | | | | | * commit '3407172b36a93cec410c6a287dbeec0f41257512': avienc: K&R formatting cosmetics Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <[email protected]>
| * avienc: K&R formatting cosmeticsKeiji Costantini2014-03-041-194/+205
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit '4c41a7a1798dd6c60e40f79be12faa98a9347151'Michael Niedermayer2014-03-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '4c41a7a1798dd6c60e40f79be12faa98a9347151': vf_frei0r: fix missing end of line character Conflicts: libavfilter/vf_frei0r.c No change as the token parsing change was not merged Merged-by: Michael Niedermayer <[email protected]>
| * vf_frei0r: fix missing end of line characterVittorio Giovara2014-03-041-1/+1
| | | | | | | | Error introduced in 61b323ce7c7cdc101eadfd7de2203922b8a39e8d.
* | Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'Michael Niedermayer2014-03-041-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54': doc: fix a couple of typos in frame.h Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <[email protected]>
| * doc: fix a couple of typos in frame.hVittorio Giovara2014-03-041-1/+1
| |
* | 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 <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-0410-13/+21
|\| | | | | | | | | | | | | | | | | | | * qatar/master: put_bits: Remove unused includes Conflicts: libavcodec/put_bits.h Merged-by: Michael Niedermayer <[email protected]>
| * put_bits: Remove unused includesVittorio Giovara2014-03-048-13/+19
| | | | | | | | | | This requires adding includes to other files that relied on these being included implicitly.
* | Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'Michael Niedermayer2014-03-042-10/+7
|\| | | | | | | | | | | | | * commit '5397386effba2e53e4ff82852a86f6be4d59e9c1': mathops: move macro to the only place it is used Merged-by: Michael Niedermayer <[email protected]>
| * mathops: move macro to the only place it is usedVittorio Giovara2014-03-042-10/+7
| | | | | | | | This helps in disentangling lavf and lavc too.
* | Merge commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d'Michael Niedermayer2014-03-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * vf_frei0r: refactor library loading from env variableVittorio Giovara2014-03-042-10/+14
| | | | | | | | strtok_r is not needed any more, so remove it from configure.
* | Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'Michael Niedermayer2014-03-041-0/+4
|\| | | | | | | | | | | | | * commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e': vf_frei0r: prevent a segfault when filter parameters are not set Merged-by: Michael Niedermayer <[email protected]>
| * vf_frei0r: prevent a segfault when filter parameters are not setVittorio Giovara2014-03-041-0/+4
| |
* | Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'Michael Niedermayer2014-03-041-10/+10
|\| | | | | | | | | | | | | | | | | | | * commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9': vf_frei0r: adjust error messages Conflicts: libavfilter/vf_frei0r.c Merged-by: Michael Niedermayer <[email protected]>
| * vf_frei0r: adjust error messagesVittorio Giovara2014-03-041-12/+12
| |
* | Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer2014-03-0435-3/+166
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * lukaszmluki/master: lavd/avdevice: add device iterators lavd: add categories to device implementations lavu/log: add device categories Merged-by: Michael Niedermayer <[email protected]>
| * | lavd/avdevice: add device iteratorsLukasz Marek2014-03-034-1/+89
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <[email protected]>
| * | lavd: add categories to device implementationsLukasz Marek2014-03-0328-1/+58
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <[email protected]>
| * | lavu/log: add device categoriesLukasz Marek2014-03-033-1/+19
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <[email protected]>
* | | avcodec/h263dec: Workaround H263 end padding bugMichael Niedermayer2014-03-041-0/+11
| | | | | | | | | | | | | | | | | | Fixes: H263PaddingBugFixVID_6647.MOV Signed-off-by: Michael Niedermayer <[email protected]>
* | | 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 <[email protected]>
* | | 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.
* | ffmpeg: dont try to run the subtitle encoder on non subtitle streamsMichael Niedermayer2014-03-031-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/httpauth: add comment about "" and algorithmMichael Niedermayer2014-03-031-0/+3
| | | | | | | | | | Suggested-by: ubitux Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | libutvideoenc: Add support for the new BT.709 FourCCs for YCbCrJan Ekström2014-03-031-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> This applies commit 5de64bb3 (the source of the above commit message) to libutvideoenc as well. Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
* | Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'Michael Niedermayer2014-03-021-10/+10
|\| | | | | | | | | | | | | | | | | | | * commit '5c9c305d14730faf2af206e5d519df4948de0ed2': ass: K&R formatting cosmetics Conflicts: libavformat/assdec.c Merged-by: Michael Niedermayer <[email protected]>
| * ass: K&R formatting cosmeticsPatrice Clement2014-03-021-46/+49
| |
* | avcodec/hevcpred_template: also initialize top[-1] for constrained intra ↵Michael Niedermayer2014-03-021-0/+1
| | | | | | | | | | | | | | | | | | 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 <[email protected]>
* | avcodec/g2meet: also reset local got_header when reseting the context got_headerMichael Niedermayer2014-03-021-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/g2meet: fix error returnsMichael Niedermayer2014-03-021-4/+8
| | | | | | | | | | | | | | | | | | | | 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 <[email protected]>
* | 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
* | x86/synth_filter: Revert the switch to float ops with SSE2James Almer2014-03-021-4/+17
| | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
* | 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 <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-020-0/+0
|\| | | | | | | | | | | | | | | * qatar/master: ituh263: reject b-frame with pp_time = 0 See: bb01be80462adcf4900c925e25bc644e512a4b7b Merged-by: Michael Niedermayer <[email protected]>
| * ituh263: reject b-frame with pp_time = 0Keiji Costantini2014-03-011-0/+2
| | | | | | | | | | | | | | | | | | 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 <[email protected]>
* | x86/synth_filter: add synth_filter_avxJames Almer2014-03-022-34/+49
| | | | | | | | | | | | | | | | | | Sandy Bridge Win64: 180 cycles on ff_synth_filter_inner_sse2 150 cycles on ff_synth_filter_inner_avx Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
* | avformat/aviobuf: optimize sequential backward seekingMichael Niedermayer2014-03-011-1/+12
| | | | | | | | | | | | This reduces the number of protocol seeks Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/aviobuf: factorize buffer_size outMichael Niedermayer2014-03-011-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | RELEASE: update for 2.2Michael Niedermayer2014-03-011-1/+1
| | | | | | | | | | Found-by: Timothy Signed-off-by: Michael Niedermayer <[email protected]>
* | x86/synth_filter: add synth_filter_sseJames Almer2014-03-012-29/+57
| | | | | | | | | | | | | | Build only on x86_32 targets. Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-23 13:23:51 +0000