aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'Michael Niedermayer2012-11-265-60/+66
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28c8e288fa0342fdef532a7522a4707bebf831cc': x86: h264_chromamc: port to cpuflags yop: fix typo avconv: fix copying per-stream metadata. doc: avtools-common-opts: Fix terminology concerning metric prefixes configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge riff: Make ff_riff_tags static and move under appropriate #ifdef Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264_chromamc: port to cpuflagsDiego Biurrun2012-11-251-41/+44
| |
| * yop: fix typoPaul B Mahol2012-11-251-1/+1
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * avconv: fix copying per-stream metadata.Anton Khirnov2012-11-251-0/+2
| | | | | | | | | | | | | | It is handled separately from other types because it uses stream specifiers and currently that triggers an assert in SET_DICT. CC:libav-stable@libav.org
| * doc: avtools-common-opts: Fix terminology concerning metric prefixesMarcus Stollsteimer2012-11-251-5/+6
| | | | | | | | | | | | | | | | | | 'k', 'M', and 'G' are SI (unit) prefixes or metric prefixes, not 'number postfixes'. Also, the statement regarding binary prefixes ("powers of 2 are used instead of powers of 10") might be misinterpreted (1 kB = 10^3 B, but 1 KiB != 2^3 B). Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * configure: suncc: Add compiler arch support for Nehalem & Sandy BridgeSean McGovern2012-11-251-1/+3
| | | | | | | | | | | | | | | | GCC does not appear to have a -march= string for Westmere, which is a bit surprising as it has a few more instructions than a Nehalem, but a few less than a Sandy Bridge. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * riff: Make ff_riff_tags static and move under appropriate #ifdefDiego Biurrun2012-11-251-11/+11
| | | | | | | | The table is not used outside the file.
* | lavu/samplefmt: return the size of the allocated samples buffer at the next bumpStefano Sabatini2012-11-254-3/+19
| | | | | | | | | | | | | | | | | | | | Make the functions av_samples_fill_arrays, av_samples_alloc, and avcodec_fill_audio_frame return a buffer size rather than 0 in case of success. This will be enabled at the next libavutil major bump, in order to preserve backward compatibility. Returning the size allows to simplify the code, avoiding a few function calls.
* | doc/encoders: add a note for x264 options that use colonIvan Pozdeev2012-11-251-1/+3
| | | | | | | | | | Signed-off-by: Ivan Pozdeev <ivan_pozdeev@mail.ru> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Support switching field order when decoding frwu.Carl Eugen Hoyos2012-11-251-1/+28
| | | | | | | | | | | | | | The binary encoder has a "switch field order" setting that moves one line from the top to the bottom of the frame. Fixes ticket #966.
* | imc: flush decoderMichael Niedermayer2012-11-251-0/+10
| | | | | | | | | | | | | | Fixes Ticket1899 Based on code by ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tga: check palette size earlier.Michael Niedermayer2012-11-251-4/+5
| | | | | | | | | | | | Fixes Ticket1895 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/utils: check return value of avcodec_fill_audio_frame() for < 0Stefano Sabatini2012-11-251-2/+2
| | | | | | | | | | Assume that the value is always negative in case of error, as stated in the docs, do not assume that the value cannot be != 0 in case of success.
* | lavu/opt: add support for reading pixel and sample format through av_get_int()Stefano Sabatini2012-11-252-1/+3
| | | | | | | | | | Simplify backward compatibility, when switching from AV_OPT_TYPE_INT to AV_OPT_TYPE_SAMPLE/PIXEL_FMT.
* | doc: add libswscale.texi and ffmpeg-scaler.texi filesStefano Sabatini2012-11-253-1/+193
| |
* | mpsmpeg4: use av_image_check_sizePeter Ross2012-11-251-5/+4
| | | | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avrndec: use av_image_check_sizePeter Ross2012-11-251-2/+4
| | | | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rawdec: use av_image_check_sizePeter Ross2012-11-251-4/+2
| | | | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu/imgutils: add consistency checks to av_image_copy_plane()Stefano Sabatini2012-11-253-1/+7
| | | | | | | | | | | | | | Add assertions and abort in case of invalid |dst_linesize| < bytewidth or |src_linesize| < bytewidth. Avoid to silently corrupt memory.
* | lavu/opt: fix range shown in set_format() log messageStefano Sabatini2012-11-251-1/+1
| |
* | configure: prefer "resampling" in the libswresample pkg-config descriptionStefano Sabatini2012-11-251-1/+1
| |
* | lavu/opt: add av_opt_ accessors for pixel/format/image size optionsStefano Sabatini2012-11-254-1/+120
| | | | | | | | | | The interface is implemented against the style of the other options accessors. Possibly simplify programmatic setting of options.
* | iff decoder: initialise HAM line decoder with first palette entryPeter Ross2012-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | The palette is organised into 'hold' and 'modify' pairs, hence why the first palette entry is pal[1]. Fixes ticket #1701. Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfiltergraph: add AVOption tableMichael Niedermayer2012-11-251-0/+10
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smacker: fix smacker_decode_header_tree() empty vlc table initMichael Niedermayer2012-11-251-14/+20
| | | | | | | | | | | | Fixes Ticket1858 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: set flags to indicate that byte wise seeking is not supported.Michael Niedermayer2012-11-251-0/+1
| | | | | | | | | | | | Fixes Ticket1831 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc: add libswresample.texi and ffmpeg-resampler.texi filesStefano Sabatini2012-11-253-1/+262
| |
* | doc: move filters documentation to dedicated manual page ffmpeg-filtersStefano Sabatini2012-11-253-4/+31
| |
* | doc: move codec options and descriptions to a dedicated manual pageStefano Sabatini2012-11-253-1094/+1121
| |
* | lavf/sbgdec: use proper constants for av_log().Nicolas George2012-11-241-2/+2
| |
* | Support u8 in aiff.Carl Eugen Hoyos2012-11-241-0/+1
| | | | | | | | | | Fixes ticket #1960. Reviewed-by; Paul B Mahol
* | adpcmdec: Fix OOM/infloopMichael Niedermayer2012-11-241-0/+5
| | | | | | | | | | Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libopencore_amrwb: check packet sizeMichael Niedermayer2012-11-241-0/+4
| | | | | | | | | | | | Fix OOM Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smacker: sanity check audio size.Michael Niedermayer2012-11-241-0/+5
| | | | | | | | | | | | | | Fixes, excessive memory allocation Fixes Ticket1892 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | af_aresample: check ff_get_audio_buffer() failureMichael Niedermayer2012-11-241-0/+3
| | | | | | | | | | | | Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | atrac1: Check block align.Michael Niedermayer2012-11-241-0/+5
| | | | | | | | | | | | | | Fixes OOM Fixes second samples posted in Ticket1893 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ra288: Check block align.Michael Niedermayer2012-11-241-0/+5
| | | | | | | | | | | | | | Fixes OOM Fixes Ticket1893 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix type of default value for v210 decoder option -custom_stride.Carl Eugen Hoyos2012-11-241-1/+1
| | | | | | | | Reviewed-by: Paul B Mahol
* | c93: signal EOFPiotr Bandurski2012-11-241-1/+1
| |
* | mmf: simplify code by using FFMINPaul B Mahol2012-11-241-3/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | mmf: signal EOFPaul B Mahol2012-11-241-5/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | omadec: remove stale commentPaul B Mahol2012-11-241-1/+0
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | codec_desc: mark PCM A-law/mu-law lossyPaul B Mahol2012-11-241-0/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | codec_desc: provide aliases for PCM A-law/mu-lawPaul B Mahol2012-11-241-2/+2
| | | | | | | | | | | | Inspired by d21b82fd3a72751a77dbeda3aa17a3af5e009565. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ADPCM IMA Dialogic decoderPaul B Mahol2012-11-2412-1/+55
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | rl2: return meaningful error codesPaul B Mahol2012-11-241-5/+6
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | wvenc: multichannel muxingPaul B Mahol2012-11-241-6/+50
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | omaenc: remove superfluous "OMA: "Paul B Mahol2012-11-241-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | omaenc: abort for unsupported codecsPaul B Mahol2012-11-241-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | riff: fix decoding of 24-bit packed int (type 1, 20-bit)Piotr Bandurski2012-11-241-1/+2
| |