summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* x86/qpel: move fullpel and l2 functions to separate file.Ronald S. Bultje2013-03-094-234/+259
| | | | | | | This way, they can be shared between mpeg4qpel and h264qpel without requiring either one to be compiled unconditionally. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dsputil: make square put/avg_pixels functions local to h264qpel.Ronald S. Bultje2013-03-094-58/+20
| | | | | | | | | | Put a copy of the 8bit functions only in dsputil, where they are used for some other things (e.g. mpeg4qpel, mspel, cavsqpel). We could perhaps also try to share specifically the 8bit functions from h264qpel between it and the others, but that will be slightly more complicated. H264qpel already had these functions, so we can simply remove the duplicates. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libutvideo: Prioritize compatibility with new versionsStephen Hutchinson2013-03-083-10/+14
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* lavc/utils: make sure the iconv descriptor can be opened only once.Clément Bœsch2013-03-081-7/+13
| | | | | | This prevents trying to do some subtitles conversion for each event when the character encoding is not found. It now aborts early instead of flooding stderr.
* Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'Michael Niedermayer2013-03-084-462/+6
|\ | | | | | | | | | | | | | | | | | | * commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e': Move AVFrame from lavc to lavu. Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move AVFrame from lavc to lavu.Anton Khirnov2013-03-081-347/+1
| | | | | | | | Add AVBuffer-based reference counting API to it.
* | Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'Michael Niedermayer2013-03-086-21/+25
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327': lavc: move AVFrame.hwaccel_picture_private to Picture. Conflicts: libavcodec/avcodec.h libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: move AVFrame.hwaccel_picture_private to Picture.Anton Khirnov2013-03-086-21/+25
| | | | | | | | | | This field is private and should not be present in a public struct. It is only used in DXVA with mpegvideo-based decoders currently.
* | Merge commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c'Michael Niedermayer2013-03-081-7/+13
|\ \ | |/ | | | | | | | | | | * commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c': pthread: avoid copying input packets when possible. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread: avoid copying input packets when possible.Anton Khirnov2013-03-081-7/+13
| |
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-084-57/+169
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov2013-03-084-39/+145
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
| * mp3dec: Fix VBR bit rate parsingAlexander Kojevnikov2013-03-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag. When parsing the stream, don't override the bit rate if it's already set, otherwise calculate the mean bit rate from parsed frames. This way, the bit rate will be set correctly both for CBR and VBR streams. CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8'Michael Niedermayer2013-03-081-17/+19
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8': build: cosmetics: Group hw accelerator Makefile entries together Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: cosmetics: Group hw accelerator Makefile entries togetherDiego Biurrun2013-03-071-16/+18
| |
* | Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51'Michael Niedermayer2013-03-0810-3/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51': configure: Add missing h264chroma dependencies to vp5, vp6 Add missing error_resilience includes to files that use ER Conflicts: configure libavcodec/mpeg12.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing error_resilience includes to files that use ERDiego Biurrun2013-03-0710-1/+10
| |
* | Merge commit 'd88738e4038b162708dc2f5342e10c1694edfd89'Michael Niedermayer2013-03-081-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'd88738e4038b162708dc2f5342e10c1694edfd89': mpegvideo: Conditionally build error_resilience bits Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Conditionally build error_resilience bitsMartin Storsjö2013-03-071-0/+2
| | | | | | | | | | This breaks the dependency of mpegvideo on error_resilience allowing compilation of components that depend on the former w/o the latter.
* | Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830'Michael Niedermayer2013-03-081-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'efa7f4202088c70caba11d7834641bc6eaf41830': Use the avstring.h locale-independent character type functions avstring: Add locale independent versions of some ctype.h functions Conflicts: avprobe.c doc/APIchanges libavcodec/dvdsubdec.c libavcodec/utils.c libavutil/avstring.c libavutil/avstring.h libavutil/eval.c libavutil/parseutils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use the avstring.h locale-independent character type functionsReimar Döffinger2013-03-072-5/+6
| | | | | | | | | | | | Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Revert "aacdec: Reconfigure output as needed, disable ↵Michael Niedermayer2013-03-083-27/+32
| | | | | | | | | | | | | | | | pop_output_configuration()" This reverts commit 60dbf2eff92f8aa4683b6dcaba9e694890258ade. This is not needed anymore, Ticket 1694 has been fixed differently
* | aacsbr: Check for envelope scalefactors overflowingMichael Niedermayer2013-03-081-3/+19
| | | | | | | | | | | | | | | | | | | | This prevents various values from becoming stuck at NAN and output to become silent If someone knows a cleaner solution, thats welcome! Fixes Ticket2335 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegaudio_parser: Don't ignore information from the first frameAlexander Kojevnikov2013-03-071-1/+1
| | | | | | | | | | Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | aacdec: Reconfigure output as needed, disable pop_output_configuration()Michael Niedermayer2013-03-073-32/+27
| | | | | | | | | | | | Fixes Ticket1694 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | psymodel: dont apply lowpass filters with a cutoff close to the nyquistMichael Niedermayer2013-03-071-1/+1
| | | | | | | | | | | | | | | | | | The IIR filter numerically diverges in such cases, this could easily be fixed but would make the filter slower on some platforms Fixes Ticket2246 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-073-23/+19
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: Deprecate the deinterlace functions in libavcodec h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band Conflicts: configure ffmpeg_opt.c libavcodec/avcodec.h libavcodec/h264.c libavcodec/imgconvert.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Deprecate the deinterlace functions in libavcodecRonald S. Bultje2013-03-073-0/+12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264: Integrate draw_horiz_band into ff_h264_draw_horiz_bandRonald S. Bultje2013-03-071-4/+40
| | | | | | | | | | | | | | | | | | | | This makes the decoder independent of mpegvideo. This copy of the draw_horiz_band code is simplified compared to the "generic" mpegvideo one which still has a number of special cases for different codecs. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '70762508ec5919474edb92a5b1f266fd06640f9c'Michael Niedermayer2013-03-071-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '70762508ec5919474edb92a5b1f266fd06640f9c': lavc: Prettify printing of codec tags containing non alphanumeric characters h264: Rename the jpeg_420 pixfmt list to match the common naming structure Conflicts: libavcodec/h264.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Prettify printing of codec tags containing non alphanumeric charactersStefano Sabatini2013-03-071-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Make av_get_codec_tag_string() show codec tag string characters in a more intelligible ways. For example the ascii char "@" is used as a number, so should be displayed like "[64]" rather than as a printable character. Apart alphanumeric chars, only the characters ' ' and '.' are used literally in codec tags, all the other characters represent numbers. This also avoids relying on locale-dependent character class functions. Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264: Rename the jpeg_420 pixfmt list to match the common naming structureMartin Storsjö2013-03-071-2/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | libavcodec: changed mathematical functions in aacpsy.cBojan Zivkovic2013-03-071-3/+7
| | | | | | | | | | | | | | | | | | This patch changes existing mathematical functions with faster ones. Speeds up encoding more than 10%. Tested on x86 and MIPS platforms. Signed-off-by: Bojan Zivkovic <bojan@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'Michael Niedermayer2013-03-071-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '5da51284937649a8ebb84fa951c235438fcbf8ae': cavs: Add a dependency on h264chroma lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs Conflicts: libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpeg12.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecsRonald S. Bultje2013-03-068-24/+64
| | | | | | | | | | | | | | | | | | Not all hwaccels implement all codecs, so using one single list for multiple such codecs means some codecs will be represented in the list, even though they don't actually handle that codec. Copying specific lists in each codec fixes that. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5a4e9fe855282a99586050a507d0a486ad39df5b'Michael Niedermayer2013-03-072-7/+12
|\ \ | |/ | | | | | | | | | | | | * commit '5a4e9fe855282a99586050a507d0a486ad39df5b': avcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatch shorten: use the unsigned type where needed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatchDiego Biurrun2013-03-061-1/+1
| |
| * shorten: use the unsigned type where neededLuca Barbato2013-03-061-4/+9
| | | | | | | | | | | | get_uint returns an unsigned value, use an unsigned to store blocksize to make sure the comparison logic is correct and report correctly the error for the channel count not supported.
* | Merge commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a'Michael Niedermayer2013-03-061-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '4c364eb2b856fc33cf7b42f7c7b979e69fde5f3a': shorten: report meaningful errors Conflicts: libavcodec/shorten.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * shorten: report meaningful errorsLuca Barbato2013-03-061-14/+14
| |
* | Merge commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca'Michael Niedermayer2013-03-061-110/+118
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a2ad554def214d2d03b7c16f68dc081a8622f9ca': shorten: K&R formatting cosmetics Conflicts: libavcodec/shorten.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * shorten: K&R formatting cosmeticsLuca Barbato2013-03-061-106/+113
| |
* | Merge commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5'Michael Niedermayer2013-03-062-8/+42
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'c10da30d8426a1f681d99a780b6e311f7fb4e5c5': shorten: set invalid channels count to 0 vorbisdec: check memory allocations h264: check for luma and chroma bit dept being equal Conflicts: libavcodec/shorten.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * shorten: set invalid channels count to 0Michael Niedermayer2013-03-061-0/+1
| | | | | | | | | | | | | | | | Prevent the loop shorten_decode_close from writing and freeing out of the array boundary. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * vorbisdec: check memory allocationsLuca Barbato2013-03-061-8/+36
| |
| * h264: check for luma and chroma bit dept being equalLuca Barbato2013-03-051-0/+6
| | | | | | | | | | | | | | | | | | | | The decoder assumes a single bit depth for all the planes while the specification allows different bit depths for luma and chroma. Avoid the possible problems described in CVE-2013-2277 CC: libav-stable@libav.org
* | normalize calls to ff_alloc_packet2James Zern2013-03-0628-32/+28
| | | | | | | | | | | | | | - check ret < 0 - remove excessive error log Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables.Ronald S. Bultje2013-03-063-19/+34
| | | | | | | | | | | | These are widely used throughout libavcodec, nothing dsputil-specific. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | snowenc: fix indentionMichael Niedermayer2013-03-061-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | snowenc: add forgotten emms_c()Michael Niedermayer2013-03-061-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status