summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | avformat/asfdec: pass on error code from avio_seek()Michael Niedermayer2014-02-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | * qatar/master: asfdec: fix seeking with fragmented packets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: fix seeking with fragmented packetsJanne Grunau2014-02-12
| | | | | | | | | | | | | | After seeking fragments with an offset > 0 must be skipped to correctly assemble packets. Bug-Id: 43
* | Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | | | | | | | * commit '0c082565965258dca143767cc6cb25e38b6e9ea3': asfdec: short-circuit seeking to the start of stream Conflicts: libavformat/asfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: short-circuit seeking to the start of streamAndrew Kelley2014-02-12
| | | | | | | | | | | | Bug-id: 43 Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Merge commit '0ebb523f072322972ea446616676fff32e9603c6'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ebb523f072322972ea446616676fff32e9603c6': asfdec: check ff_get_guid() return values during seeking Conflicts: libavformat/asfdec.c The code that pretends that a truncated index is correct and complete is not merged as it obviously would cause problems if a really truncated index is encountered If someone has samples that work better with that hack, please share them / mail me also the bug this apparently attempts to fix isnt reproducable before this in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfdec: check ff_get_guid() return values during seekingJanne Grunau2014-02-12
| | | | | | | | | | Hitting EOF during seeking is quite likely. Fixes use of uninitialized data during fate-seek-lavf-asf.
* | avformat/riff: return error code from ff_get_guid()Michael Niedermayer2014-02-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | | | | | | | * commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6': aacdec: set AVFrame sample_rate Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: set AVFrame sample_rateJohn Stebbins2014-02-12
| | | | | | | | | | | | AVFrame.sample_rate is set in ff_get_buffer, but aacdec calls ff_get_buffer before the samplerate is known. So it needs to be set again before returning the frame.
* | Merge commit '4a7d3837b4dd17fff270b55166597c093204e542'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | * commit '4a7d3837b4dd17fff270b55166597c093204e542': buffersrc: Have function parameter names match between .c and .h file Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * buffersrc: Have function parameter names match between .c and .h fileDiego Biurrun2014-02-12
| | | | | | | | This fixes two related Doxygen warnings. Also document one parameter.
* | Merge commit '25a1ba814ad80056247fd357ec4c6911324a3f66'Michael Niedermayer2014-02-12
|\| | | | | | | | | | | | | | | | | | | * commit '25a1ba814ad80056247fd357ec4c6911324a3f66': log: Have function parameter names match between .c and .h file Conflicts: libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * log: Have function parameter names match between .c and .h fileDiego Biurrun2014-02-12
| | | | | | | | This fixes two related Doxygen warnings.
* | Add libx265 encoderDerek Buitenhuis2014-02-12
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avfilter/lut3d: inline whole loop in interpolation function.Clément Bœsch2014-02-12
| | | | | | | | 84 → 92 fps here.
* | avformat/mov: fix keyframe flags for sample from chromium Issue 340865Michael Niedermayer2014-02-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2014-02-12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavf/lavd: version bump and APIchanges for uncoded frames. tools: add uncoded_frame test program. lavf: add uncodedframecrc test muxer. lavd/xv: preliminary support of uncoded frame. lavd/alsa: preliminary support of uncoded frame. lavf: add write_uncoded_frame() API. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/lavd: version bump and APIchanges for uncoded frames.Nicolas George2014-02-11
| | |
| * | tools: add uncoded_frame test program.Nicolas George2014-02-11
| | |
| * | lavf: add uncodedframecrc test muxer.Nicolas George2014-02-11
| | |
| * | lavd/xv: preliminary support of uncoded frame.Nicolas George2014-02-11
| | |
| * | lavd/alsa: preliminary support of uncoded frame.Nicolas George2014-02-11
| | |
| * | lavf: add write_uncoded_frame() API.Nicolas George2014-02-11
| | |
* | | avcodec/mpegaudio_parser: Delay setting codec_id if it appears wrongMichael Niedermayer2014-02-12
| | | | | | | | | | | | | | | | | | Fixes mp1/mp3 in mp4 misdetection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/mpegaudio_parser: treat codec_id like the other parametersMichael Niedermayer2014-02-12
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec: Add avpriv_mpa_decode_header2()Michael Niedermayer2014-02-11
| | | | | | | | | | | | | | | | | | The difference to avpriv_mpa_decode_header() is that it doesnt need or modify the context Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * qatar/master: lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavc: set AVFrame pkt_pts and reordered_opaque in reget_bufferJohn Stebbins2014-02-11
| | | | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | | Merge commit '6477449243db4aab15a4db356e8354c60b5366ec'Michael Niedermayer2014-02-11
|\| | | | | | | | | | | | | | | | | | | | * commit '6477449243db4aab15a4db356e8354c60b5366ec': g2meet: make JPEG tile decoder operate on 8x8 block mask Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | g2meet: make JPEG tile decoder operate on 8x8 block maskKostya Shishkov2014-02-11
| | | | | | | | | | | | This is needed for upcoming Go2Meeting (G2M2/G2M3) decoder.
* | | Merge commit 'd6d78518018a12fb495baab5663708a830f3aab6'Michael Niedermayer2014-02-11
|\| | | |/ |/| | | | | | | | | | | | | | | | | * commit 'd6d78518018a12fb495baab5663708a830f3aab6': g2meet: factor out seeking to the chunk end Conflicts: libavcodec/g2meet.c See: 3f826039ddccdd7840cdf982a1a61cb11121a5a9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * g2meet: factor out seeking to the chunk endMaxim Poliakovski2014-02-11
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | x86: add missing XOP checks and macrosJames Almer2014-02-11
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/frei0r: load plugins from lib64 folders as well on 64bit buildsMarton Balint2014-02-11
| | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/libssh: Fix libssh defaulting to shared linkage.Matt Oliver2014-02-11
| | | | | | | | | | | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com> See: [FFmpeg-devel] Fix libssh static linkage on Windows Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ra144: remove redundant AV_ZERO128Michael Niedermayer2014-02-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ra144: use scalarproduct_int16Christophe Gisquet2014-02-10
| | | | | | | | | | | | | | | | The buffer holding the coefficients must be padded with 0 so as to use DSP functions that may overread. Currently, the SSE2/3 versions is an example, as they process batches of 16 bytes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | | | * qatar/master: rpza: limit the number of blocks to the total remaining blocks in the frame See: 3819db745da2ac7fb3faacb116788c32f4753f34 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rpza: limit the number of blocks to the total remaining blocks in the frameAnton Khirnov2014-02-10
| | | | | | | | | | | | | | Fixes invalid writes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1': rpza: move some variables to the blocks where they are used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rpza: move some variables to the blocks where they are usedAnton Khirnov2014-02-10
| |
* | Merge commit 'c7769df178fd670156f1c11f6c8410ddd59bbfee'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit 'c7769df178fd670156f1c11f6c8410ddd59bbfee': rpza: use fixed-width int types Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rpza: use fixed-width int typesAnton Khirnov2014-02-10
| |
* | Merge commit 'e1218ce9149aad0ae9770a32a78d77ad2210bd64'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit 'e1218ce9149aad0ae9770a32a78d77ad2210bd64': rpza: switch to bytestream2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rpza: switch to bytestream2Anton Khirnov2014-02-10
| |
* | ffmpeg: fix vstatsMichael Niedermayer2014-02-10
| | | | | | | | | | Broken by: 394fb56c29eee7f4f8f0334d8b5d30d3c54ac703 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703'Michael Niedermayer2014-02-10
|\| | | | | | | | | | | | | * commit '394fb56c29eee7f4f8f0334d8b5d30d3c54ac703': lavf: always unref the packet passed to av_interleaved_write_frame() on error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: always unref the packet passed to av_interleaved_write_frame() on errorAnton Khirnov2014-02-10
| |
* | doc/APIchanges: fill in FFmpeg hashes & versionsMichael Niedermayer2014-02-10
| | | | | | | | | | | | Entries that have no hash at all are not filled in Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-20 23:36:18 +0000