aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-0910-28/+89
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: use default alignment for audio buffer avcodec: use align == 0 for default alignment in avcodec_fill_audio_frame() avutil: use align == 0 for default alignment in audio sample buffer functions avutil: allow NULL linesize in av_samples_fill_arrays() and av_samples_alloc() avconv: remove OutputStream.picref. avconv: only set SAR once on the decoded frame. avcodec: validate the channel layout vs. channel count for decoders audioconvert: make av_get_channel_layout accept composite names. avutil: add av_get_packed_sample_fmt() and av_get_planar_sample_fmt() Conflicts: doc/APIchanges ffmpeg.c libavcodec/utils.c libavcodec/version.h libavutil/audioconvert.c libavutil/audioconvert.h libavutil/avutil.h libavutil/samplefmt.c libavutil/samplefmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | avconv: use default alignment for audio bufferJustin Ruggles2012-04-091-1/+1
| | |
| * | avcodec: use align == 0 for default alignment in avcodec_fill_audio_frame()Justin Ruggles2012-04-093-4/+4
| | | | | | | | | | | | Use default alignment in audio_get_buffer()
| * | avutil: use align == 0 for default alignment in audio sample buffer functionsJustin Ruggles2012-04-093-3/+8
| | |
| * | avutil: allow NULL linesize in av_samples_fill_arrays() and av_samples_alloc()Justin Ruggles2012-04-092-5/+8
| | |
| * | avconv: remove OutputStream.picref.Anton Khirnov2012-04-091-5/+5
| | | | | | | | | | | | | | | It's only used inside transcode_video() and there's no point in preserving it between subsequent calls. So use a local variable instead.
| * | avconv: only set SAR once on the decoded frame.Anton Khirnov2012-04-091-2/+3
| | | | | | | | | | | | No point in repeating the assignment for each output stream.
| * | avcodec: validate the channel layout vs. channel count for decodersJustin Ruggles2012-04-081-0/+9
| | | | | | | | | | | | | | | Set avctx->channel_layout to 0 if the channel count does not match avctx->channels.
| * | audioconvert: make av_get_channel_layout accept composite names.Nicolas George2012-04-083-12/+54
| | | | | | | | | | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * | avutil: add av_get_packed_sample_fmt() and av_get_planar_sample_fmt()Justin Ruggles2012-04-084-11/+55
| | | | | | | | | | | | Based on a patch by Clément Bœsch <ubitux@gmail.com>
* | | Fix gif regression test on big-endian.Reimar Döffinger2012-04-092-14/+14
| | | | | | | | | | | | | | | | | | | | | Decode output must be converted to rgb24 to avoid CRC difference due to palette being stored in machine endianness. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | exr: optimize exr_halflt2uint()Michael Niedermayer2012-04-091-8/+6
| | | | | | | | | | | | | | | | | | 30% faster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Add gif and xbm regression tests.Reimar Döffinger2012-04-093-0/+37
| | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | vf_scale: ensure the palette is set for output.Reimar Döffinger2012-04-097-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | Since those are pseudo-palette formats, swscale does not write into data[1], swscale must initialize the palette properly itself. This lead to frames that actually decoded as all-gray before. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | Mark GRAY8 format as pseudo-paletted.Reimar Döffinger2012-04-093-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes that the GIF encoder crashes with it because it has no palette. And the arguments for the pseudopalette apply to gray8 as much as to RGB8 etc. In addition the changes required in lavfi should be needed anyway when adding support for RGB8 etc. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | scale: fix slice rendering with conversion between pal/non-pal.Reimar Döffinger2012-04-091-2/+5
| | | | | | | | | | | | | | | | | | | | | We can't use whether the input format is paletted to decide that the output format has a palette in data[1], too, that makes no sense. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | RV20: try keeping aspect during resolution changes.Reimar Döffinger2012-04-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolution changes are usually only used to scale with network bandwidth, the (full) resolution specified in the RM header really is authoritative. While I am not sure this is the best solution, it is a conservative approach that still should fix the most common cases. In particular, it fixes aspect with the sample from trac issue #785 (in MPlayer, ffplay seems to just ignore sample aspect changes in mid-playback). Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | aacdec: update debug code to always print the processed data.Reimar Döffinger2012-04-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | When decoding LATM, this function will not process extradata but a different buffer. It seems this was forgotten to update when LATM support was added. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | Add v408 codec regression test.Reimar Döffinger2012-04-093-0/+13
| | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | Add roqaudio regression test.Reimar Döffinger2012-04-092-0/+9
| | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-0811-15/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtsp: Don't use av_malloc(0) if there are no streams rtsp: Don't use uninitialized data if there are no streams vaapi: mpeg2: fix slice_vertical_position calculation. hwaccel: mpeg2: decode first field, if requested. cosmetics: Fix indentation rtsp: Don't expose the MS-RTSP RTX data stream to the caller Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | rtsp: Don't use av_malloc(0) if there are no streamsMartin Storsjö2012-04-081-2/+3
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | rtsp: Don't use uninitialized data if there are no streamsMartin Storsjö2012-04-081-1/+1
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | vaapi: mpeg2: fix slice_vertical_position calculation.Gwenole Beauchesne2012-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VASliceParameterBufferMPEG2.slice_vertical_position shall express the slice vertical position from the original bitstream. The HW decoder will correctly decode to the right line computed from the appropriate top_field_first and is_first_field flags. This patch aligns with DXVA's definition, which is what most HW and drivers expect. In particular, Intel PowerVR (Cedarview et al.) and NVIDIA (through VA-to-VDPAU layer). Since it looks more complex to fix binary drivers, I aligned the Intel Gen driver (Sandy Bridge et al.) to this behaviour, while maintaining compatibility with codec layers not providing this patch yet. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * | hwaccel: mpeg2: decode first field, if requested.Gwenole Beauchesne2012-04-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user opted to present fields as they come, then the first field picture needs to be submitted to the HW for decoding. In particular, this fixes MPEG-2 decoding of interlaced streams. Tested on Intel Cedar Trail, Sandy Bridge and Ivy Bridge platforms. Someone reported on the ffmpeg-devel@ list this also works on DXVA (Windows) and other Linux platforms (NVIDIA, through the VA wrapper). This also means a similar patch to non-hwaccel VDPAU may be necessary. Note: I believe the SLICE_FLAG_ALLOW_FIELD is useless since the first field shall always be submitted to the HW anyway. Nobody uses HW accels (dxva, vaapi, vdpau, etc.) without that flag though. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> Signed-off-by: Martin Storsjö <martin@martin.st>
| * | cosmetics: Fix indentationMartin Storsjö2012-04-081-1/+1
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | rtsp: Don't expose the MS-RTSP RTX data stream to the callerMartin Storsjö2012-04-088-10/+37
| | | | | | | | | | | | | | | | | | | | | | | | This avoids exposing a dummy AVStream which won't get any data and which will make avformat_find_stream_info wait for info about this stream. Signed-off-by: Martin Storsjö <martin@martin.st>
* | | Allow running fate-wmv8-x8intra manually.Reimar Döffinger2012-04-081-1/+2
| | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | Allow manually running disabled FATE tests.Reimar Döffinger2012-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This makes it easy to allow people to run tests that are disabled (e.g. because they are broken) without having to hack Makefiles by adding the test name to FATE_TESTS-no. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | Fix nellymoser encoder crash with hardcoded tables.Reimar Döffinger2012-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | Use the correct init function to avoid crashes due to writing to a rodata location. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | Update reference for disabled fate-wmv8-x8intra test to new format.Reimar Döffinger2012-04-081-473/+474
| | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | ffv1: set slice geometry based on user specified slices.Michael Niedermayer2012-04-081-2/+9
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffv1: allow enabling of version 2 by using some of its features.Michael Niedermayer2012-04-081-0/+9
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffv1: fix version=2 chroma handlingMichael Niedermayer2012-04-081-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffv1: add a minor version field beginning with ffv1.3Michael Niedermayer2012-04-081-0/+5
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Fix side-data memleak also for audio.Reimar Döffinger2012-04-082-6/+12
| | | | | | | | | | | | | | | | | | | | | This uses the same code as in decode_video also in decode_audio. Should fix valgrind FATE failures for nellymoser encode test. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | mpegtsenc: Add support to mux s302 streamThierry Foucu2012-04-081-0/+8
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | configure: fix - vs _ errorMichael Niedermayer2012-04-081-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Add nellymoser "fuzzy" FATE test.Reimar Döffinger2012-04-085-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | Since we cannot specify decode parameters (and also because it is better in principle) the 1-channel reference file needs to be enabled, too. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | Allow setting CODEC_FLAG2_CHUNKS via the name "chunks".Reimar Döffinger2012-04-081-0/+1
| | | | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | Fixes for third argument do_image_formats.Reimar Döffinger2012-04-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove it from two places where it is useless, do not apply it to the encode command and make it apply to the output instead of the input of the decode command. Should fix the dpx test. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | | ffprobe: use avbprint APIStefano Sabatini2012-04-081-184/+81
| | | | | | | | | | | | Simplify, increase robustness.
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-07207-756/+771
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec_asf: Set the no_resync_search option for the chained asf demuxer asfdec: Add an option for not searching for the packet markers cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others cosmetics: Align codec declarations cosmetics: Convert mimic.c to utf-8 avconv: remove an unused function parameter. avconv: remove now pointless variables. avconv: drop support for building without libavfilter. nellymoserenc: fix crash due to memsetting the wrong area. libavformat: Only require first packet to be known for audio/video streams avplay: Don't try to scale timestamps if the tb isn't set Conflicts: Changelog configure ffmpeg.c libavcodec/aacenc.c libavcodec/bmpenc.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/ffv1.c libavcodec/flacenc.c libavcodec/fraps.c libavcodec/huffyuv.c libavcodec/libopenjpegdec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/pamenc.c libavcodec/pgssubdec.c libavcodec/pngenc.c libavcodec/qtrleenc.c libavcodec/rawdec.c libavcodec/sgienc.c libavcodec/tiffenc.c libavcodec/v210dec.c libavcodec/wmv2dec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | rtpdec_asf: Set the no_resync_search option for the chained asf demuxerMartin Storsjö2012-04-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Searching for packet markers doesn't make sense for this use case, where packets are fed one at a time to the demuxer. This fixes playing back streams that have packets not starting with the 0x82, 0x00, 0x00 marker. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | asfdec: Add an option for not searching for the packet markersMartin Storsjö2012-04-071-1/+20
| | | | | | | | | | | | | | | | | | Some streams don't contain these. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of ↵Martin Storsjö2012-04-071-6/+6
| | | | | | | | | | | | | | | | | | others Signed-off-by: Martin Storsjö <martin@martin.st>
| * | cosmetics: Align codec declarationsMartin Storsjö2012-04-06200-638/+731
| | | | | | | | | | | | | | | | | | | | | Also break some long lines, remove codec function placeholder comments and add spaces in sample/pixel format lists. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | cosmetics: Convert mimic.c to utf-8Martin Storsjö2012-04-061-1/+1
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | avconv: remove an unused function parameter.Anton Khirnov2012-04-061-2/+1
| | |
| * | avconv: remove now pointless variables.Anton Khirnov2012-04-061-10/+2
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 02:02:55 +0000