summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'Michael Niedermayer2013-10-13
|\ | | | | | | | | | | | | | | | | | | * commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0': indeo4: Check the block size if reusing the band configuration Conflicts: libavcodec/indeo4.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo4: Check the block size if reusing the band configurationLuca Barbato2013-10-13
| | | | | | | | | | | | | | Sample-Id: 00000287-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'Michael Niedermayer2013-10-13
|\| | | | | | | | | | | | | * commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937': oggparsevorbis: fail on memory allocation error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsevorbis: fail on memory allocation errorVittorio Giovara2013-10-12
| |
* | Merge commit 'c18375ec8040a9fe0f186b2033dc975883143758'Michael Niedermayer2013-10-13
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c18375ec8040a9fe0f186b2033dc975883143758': oggvorbisdec: add support for embedded cover art Conflicts: libavformat/oggparsevorbis.c See: 193782216fc8179ec92d498449be0a51e4c7c658 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggvorbisdec: add support for embedded cover artJames Almer2013-10-12
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'Michael Niedermayer2013-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '601d6228c4811d8971a2412a759e1a4ab775ebe8': flac: move picture parsing code in a separate file Conflicts: libavformat/Makefile libavformat/flacdec.c See: 1e5bbbfcf303ec3db0c7db30b85855e2e5358aec Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac: move picture parsing code in a separate fileJames Almer2013-10-12
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'Michael Niedermayer2013-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecab1c77410f023b437c6ed3a3281be8f039e574': oggdec: add support for Opus in Ogg demuxing Conflicts: Changelog libavformat/oggparseopus.c libavformat/version.h See: e62fd6619f7aa91956a1b4ccfa7b0b8d7bc4ba90 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggdec: add support for Opus in Ogg demuxingNicolas George2013-10-12
| |
* | Merge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'Michael Niedermayer2013-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ed9245dba83f9add60f55718b537b0af2105c60e': oggparsevorbis: check allocations Conflicts: libavformat/oggparsevorbis.c See: 033f1644b59abd755bb529afa5db394d18d9c30b See: 84aea80f7824c23b4cbf101f03e2b5b418a79d80 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsevorbis: check allocationsVittorio Giovara2013-10-12
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'Michael Niedermayer2013-10-13
|\| | | | | | | | | | | | | | | | | | | | | * commit '9c15ef35d404fca2adc31276c1eedb11cf485461': oggparsevorbis: support official chapter extension Conflicts: libavformat/oggparsevorbis.c See: 04b9836274f390e39879c2666f7967990f0382cc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsevorbis: support official chapter extensionJames Almer2013-10-12
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b'Michael Niedermayer2013-10-13
|\| | | | | | | | | | | | | * commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b': lavc doxy: extend/clarify avcodec_decode_audio4() doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc doxy: extend/clarify avcodec_decode_audio4() doxyAnton Khirnov2013-10-12
| | | | | | | | Elaborate on flushing the decoder.
* | Merge commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a'Michael Niedermayer2013-10-13
|\| | | | | | | | | | | | | * commit '66d3f5fd5ca4cb3d09b52ad1041cd4359325a21a': lavc doxy: remove false statements about alignment requirements. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc doxy: remove false statements about alignment requirements.Anton Khirnov2013-10-12
| | | | | | | | The packet data does not need to be aligned.
* | Merge commit '364af376f343d4706c4cdb7ab9fe0863994e6c01'Michael Niedermayer2013-10-13
|\| | | | | | | | | | | | | | | | | * commit '364af376f343d4706c4cdb7ab9fe0863994e6c01': FATE: add lavr resampling tests The tests do not pass, and thus where disabled Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: add lavr resampling testsAnton Khirnov2013-10-12
| |
* | Merge commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1'Michael Niedermayer2013-10-13
|\| | | | | | | | | | | | | | | | | * commit '9ab5f7107d2f1411e9fda6c36af64524e5ed31d1': FATE: add lavr mixing tests The tests do not pass, and thus where disabled Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: add lavr mixing testsAnton Khirnov2013-10-12
| |
* | Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c'Michael Niedermayer2013-10-13
|\| | | | | | | | | | | | | * commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c': audio_mix: fix channel order in mix_1_to_2_fltp_flt_c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * audio_mix: fix channel order in mix_1_to_2_fltp_flt_cAnton Khirnov2013-10-12
| | | | | | | | CC:libav-stable@libav.org
* | lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for ↵Michael Niedermayer2013-10-13
| | | | | | | | | | | | | | | | | | | | | | | | backward compatibility Somehow 2 different identifiers have come into existence which makes supporting both until the next major version bump required I did not investigate how exactly that did happen. wm4, j-b and smarter prefer hevc. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avr: use ff_get_pcm_codec_id()Paul B Mahol2013-10-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/vsrc_testsrc: smpte(hd)bars: use yuv directlyPaul B Mahol2013-10-12
| | | | | | | | | | | | Also set color space. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/vf_separatefields: do not reset pts to 0Paul B Mahol2013-10-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer2013-10-12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * lukaszmluki/master: avformat/ftp: add log regarding passive mode failure avformat/ftp: fix possible deadlock avdevice/pulse_audio_enc: fix stream index Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | avformat/ftp: add log regarding passive mode failureLukasz Marek2013-10-12
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
| * | avformat/ftp: fix possible deadlockLukasz Marek2013-10-12
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
| * | avdevice/pulse_audio_enc: fix stream indexLukasz Marek2013-10-12
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-12
|\ \ \ | |/ / |/| / | |/ | | | | | | * qatar/master: riff: Add a mapping for VP6A Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: Add a mapping for VP6AMartin Storsjö2013-10-12
| | | | | | | | | | | | This allows demuxing VP6A from F4V files. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avfilter/lavfutils: fix memleak of avpacketMichael Niedermayer2013-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_removelogo: fix pixel pointer so it points where its intendedMichael Niedermayer2013-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_removelogo: fix offset for accessing pixels above and belowMichael Niedermayer2013-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_removelogo: use av_freep() for safteyMichael Niedermayer2013-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: set XDCAM codec tag correctlyMichael Niedermayer2013-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: set pretty compressor name for XDCAMMichael Niedermayer2013-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: make AVStream easier to accessMichael Niedermayer2013-10-12
| | | | | | | | | | | | This adds a AVStream pointer to Track Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/codecs: Add missing mpeg2 aac profilesTimothy Gu2013-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/codecs: Add ignorecropTimothy Gu2013-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/codecs: Remove no longer existing optionsTimothy Gu2013-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/codecs: Cosmetics in the flags2 descriptionTimothy Gu2013-10-11
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/codecs: document skip_alphaMichael Niedermayer2013-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-11
|\| | | | | | | | | | | | | | | * qatar/master: prores: Reject negative run and level values See: 93c220e895a417e88a6be7df85e250c5c3f675b6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * prores: Reject negative run and level valuesLuca Barbato2013-10-10
| | | | | | | | | | | | | | Sample-Id: 00000611-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | doc/filters/scale: do not explicitly state the default swscale flags valueStefano Sabatini2013-10-11
| | | | | | | | | | This is done is order to avoid the need of synching scale with libswscale docs in case the libswscale default changes.
* | lavf/riff.c: Fix GeoVision H.264 fourcc.Carl Eugen Hoyos2013-10-11
| | | | | | | | Fixes d24da748
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 14:09:53 +0000