aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'a1c699659d56b76c0bf399307f642c6fd6d28281'Michael Niedermayer2014-02-251-93/+103
|\ | | | | | | | | | | | | | | | | | | * commit 'a1c699659d56b76c0bf399307f642c6fd6d28281': parser: K&R formatting cosmetics Conflicts: libavcodec/parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * parser: K&R formatting cosmeticsLuca Barbato2014-02-251-95/+105
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303'Michael Niedermayer2014-02-251-9/+2
|\| | | | | | | | | | | | | * commit 'ed61f3ca8a0664a697782253b354055136c5d303': parser: Remove commented-out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * parser: Remove commented-out cruftDiego Biurrun2014-02-251-9/+2
| |
* | mpegvideo: re-indent buffer clearing codeHendrik Leppkes2014-02-251-13/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: fix overwriting hwaccel surface objectsHendrik Leppkes2014-02-251-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vp8dsp: use AV_ZERO64 to clear idct coefficient rowsPeter Ross2014-02-251-12/+3
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-251-0/+2
|\| | | | | | | | | | | | | | | | | | | * qatar/master: texi2pod: always declare the pod file as UTF-8 encoded Conflicts: doc/texi2pod.pl Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * texi2pod: always declare the pod file as UTF-8 encodedJanne Grunau2014-02-241-0/+2
| |
* | lavu/buffer: add release functionLukasz Marek2014-02-252-0/+41
| | | | | | | | | | | | | | new function allows to unref buffer and obtain its data. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code checkTimothy Gu2014-02-251-3/+3
| | | | | | | | | | | | | | avio_open2() only return < 0 when error. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-241-1/+1
|\| | | | | | | | | | | | | * qatar/master: doc: fix one accented word Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: fix one accented wordVittorio Giovara2014-02-241-1/+1
| |
* | Merge commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'Michael Niedermayer2014-02-241-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9': doc: name correct header Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: name correct headerVittorio Giovara2014-02-241-1/+1
| |
* | Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'Michael Niedermayer2014-02-241-1/+7
|\| | | | | | | | | | | | | | | | | | | * commit '39c2880eeae6930b1036ce1f479afc1e1152c13f': af_volume: preserve frame properties Conflicts: libavfilter/af_volume.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_volume: preserve frame propertiesAnton Khirnov2014-02-241-1/+7
| |
* | Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'Michael Niedermayer2014-02-241-0/+8
|\| | | | | | | | | | | | | * commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d': af_resample: preserve frame properties Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * af_resample: preserve frame propertiesAnton Khirnov2014-02-241-0/+8
| |
* | Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'Michael Niedermayer2014-02-242-2/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit '67f2a688143b644f99360565a9f36c61a5f052e9': avconv: remove a write-only variable Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: remove a write-only variableAnton Khirnov2014-02-242-2/+0
| |
* | Merge commit '8aca00cc2b25810bdd85b75f5632844a5614b707'Michael Niedermayer2014-02-240-0/+0
|\| | | | | | | | | | | | | | | * commit '8aca00cc2b25810bdd85b75f5632844a5614b707': libx265: Properly handled dynamic linking with MSVC See: 87769d6c8f6d71e4814821f7e6f57b4b65eaf2a7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx265: Properly handled dynamic linking with MSVCDerek Buitenhuis2014-02-241-0/+4
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '0f7fa48cf1a36ed135c9e0cb01a6b84179aea25b'Michael Niedermayer2014-02-240-0/+0
|\| | | | | | | | | | | | | | | * commit '0f7fa48cf1a36ed135c9e0cb01a6b84179aea25b': libx265: Support SAR See: 73ee4cf3073bd3b98580cd0b31521972746bd2d4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx265: Support SARDerek Buitenhuis2014-02-241-0/+10
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '2142b2efcd631db05e4c7c26785e337ecf1258ff'Michael Niedermayer2014-02-240-0/+0
|\| | | | | | | | | | | | | | | * commit '2142b2efcd631db05e4c7c26785e337ecf1258ff': libx265: Support 4:4:4 See: d102925a6d4ac1c6fb901fe2df052811e5814d60 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx265: Support 4:4:4Derek Buitenhuis2014-02-241-0/+23
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'Michael Niedermayer2014-02-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd00a504b244e136a0c82a55e21ed94659e0674ad': libx265: Update API usage Conflicts: libavcodec/libx265.c See: d3736471948cd06851f6b3aef352ef285b7c6480 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx265: Update API usageDerek Buitenhuis2014-02-242-5/+11
| | | | | | | | | | | | | | Framerate is now a sane rational instead of an integer, and inputDepth is changed to what it actually is. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avformat/options_table: add named constants for avoid_negative_tsMichael Niedermayer2014-02-242-7/+19
| | | | | | | | | | | | | | Idea-by: ubitux Reviewed-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libx265: Use proper error codeDerek Buitenhuis2014-02-241-1/+1
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | libx265: Properly handled dynamic linking with MSVCDerek Buitenhuis2014-02-241-0/+4
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | libx265: Support SARDerek Buitenhuis2014-02-241-0/+10
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | libx265: Support 4:4:4Derek Buitenhuis2014-02-241-0/+23
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | libx265: Update API usageDerek Buitenhuis2014-02-242-5/+11
| | | | | | | | | | | | | | Framerate is now a sane rational instead of an integer, and inputDepth is changed to what it actually is. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-242-6/+2
|\| | | | | | | | | | | | | | | | | | | * qatar/master: Use av_frame_copy() to simplify code where appropriate. Conflicts: libavfilter/vf_copy.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use av_frame_copy() to simplify code where appropriate.Anton Khirnov2014-02-242-6/+2
| |
* | Merge commit '8feac29cc46270cc89d6016340e7bac780877131'Michael Niedermayer2014-02-241-7/+9
|\| | | | | | | | | | | | | * commit '8feac29cc46270cc89d6016340e7bac780877131': lavc: use AVFrame API properly in ff_reget_buffer() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use AVFrame API properly in ff_reget_buffer()Anton Khirnov2014-02-241-7/+9
| |
* | avutil/frame_copy_audio: also check that channels matchMichael Niedermayer2014-02-241-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'Michael Niedermayer2014-02-244-19/+84
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1155fd02ae7bac215acab316e847c6bb25f74fc3': frame: add a convenience function for copying AVFrame data Conflicts: doc/APIchanges libavutil/frame.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * frame: add a convenience function for copying AVFrame dataAnton Khirnov2014-02-244-17/+82
| |
* | Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'Michael Niedermayer2014-02-242-3/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit '746dca483a2f0f2639265f6e1c0085c8861875a1': avconv: support forcing codec tags for input streams Conflicts: doc/ffmpeg.texi See: 6bca574a98ba604459f6ee92538b19d25bba0973 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: support forcing codec tags for input streamsAnton Khirnov2014-02-242-2/+12
| |
* | x86: Move XOP emulation to x86utilJames Almer2014-02-243-23/+23
| | | | | | | | | | | | | | | | | | | | | | We need the emulation to support the cases where the first argument is the same as the fourth. To achieve this a fifth argument working as a temporary may be needed. Emulation that doesn't obey the original instruction semantics can't be in x86inc. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr: check that the context for swr_convert() has been initializedMichael Niedermayer2014-02-241-0/+5
| | | | | | | | | | Reviewed-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: add swr_is_initialized()Michael Niedermayer2014-02-244-2/+16
| | | | | | | | | | | | Idea-from/based-on: 7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731 Reviewed-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: validate VP8 keyframesJames Almer2014-02-241-2/+10
| | | | | | | | | | | | | | Fixes seeking with broken files Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-231-5/+4
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: add detection for Bit Manipulation Instruction sets Conflicts: libavutil/x86/cpu.c See: 0bc3de19ffe296254f214dc7615e624d8e401bcb Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: add detection for Bit Manipulation Instruction setsJames Almer2014-02-233-6/+19
| | | | | | | | | | | | Based on x264 code Signed-off-by: James Almer <jamrial@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 09:02:58 +0000