aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* swr: use native planar sample formats.Clément Bœsch2011-11-243-21/+20
|
* lavu: add av_get_alt_sample_fmt().Clément Bœsch2011-11-244-11/+32
|
* swr: fix test program.Clément Bœsch2011-11-241-0/+1
| | | | | | | The number of used channels need to be reset to zero when swr_alloc_set_opts() is called successive times. This is a regression introduced in c8136ebd.
* loco: Fix error handling.Michael Niedermayer2011-11-241-1/+4
| | | | | | Fixes null pointer dereference / http://www.google-melange.com/gci/task/view/google/gci2011/7120335 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avio: Fix handling of filenames that contain :Michael Niedermayer2011-11-241-3/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fix adts format creation in aac+ encoder modified: libavcodec/libaacplus.cSergiy Gur'yev2011-11-241-3/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: rewrite vsync / notimestamps handlingMichael Niedermayer2011-11-242-3/+2
| | | | | | | | | | The qatar implementation makes no sense. a muxer without timestamps is constant fps thus needs vsync. the crc/mp5 are special cases that have timestamps yet allow any nonsensical timestamps. raw (yuv/rgb) video is constant fps thus needs vsync too. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-2439-1259/+969
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libavutil: add utility functions to simplify allocation of audio buffers. libavutil: add planar sample formats and av_sample_fmt_is_planar() avconv: fix segfault at EOF with delayed pictures pcmdec: remove unneeded resetting of samples pointer avconv: remove a now unused parameter from output_packet(). avconv: formatting fixes in output_packet() avconv: declare some variables in blocks where they are used avconv: use the same behavior when decoding audio/video/subs bethsoftvideo: return proper consumed size for palette packets. cdg: skip packets that don't contain a cdg command. crcenc: add flags avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats. tiffenc: add a private option for selecting compression algorithm md5enc: add flags ARM: remove needless .text/.align directives Conflicts: doc/APIchanges libavcodec/tiffenc.c libavutil/avutil.h libavutil/samplefmt.c libavutil/samplefmt.h tests/ref/fate/bethsoft-vid tests/ref/fate/cdgraphics tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/mpeg2-field-enc tests/ref/fate/nuv tests/ref/fate/tiertex-seq tests/ref/fate/tscc-32bit tests/ref/fate/vmnc-32bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: add utility functions to simplify allocation of audio buffers.Justin Ruggles2011-11-234-1/+123
| | | | | | | | Based on code by Stefano Sabatini.
| * libavutil: add planar sample formats and av_sample_fmt_is_planar()Justin Ruggles2011-11-234-6/+37
| |
| * avconv: fix segfault at EOF with delayed picturesJanne Grunau2011-11-241-2/+5
| | | | | | | | | | | | At EOF it makes no sense to modify avpkt.{data,size} in output_packet since no data is consumed. Frame threading with more than 1 threads hits the segfault.
| * pcmdec: remove unneeded resetting of samples pointerJustin Ruggles2011-11-231-3/+0
| |
| * avconv: remove a now unused parameter from output_packet().Anton Khirnov2011-11-231-3/+3
| |
| * avconv: formatting fixes in output_packet()Anton Khirnov2011-11-231-6/+7
| |
| * avconv: declare some variables in blocks where they are usedAnton Khirnov2011-11-231-3/+3
| |
| * avconv: use the same behavior when decoding audio/video/subsAnton Khirnov2011-11-231-13/+8
| | | | | | | | | | | | | | I.e. if the packet was only partially consumed, pass the rest of it into the decoder again. Also simplify the code so it's the same for video/audio/subs.
| * bethsoftvideo: return proper consumed size for palette packets.Anton Khirnov2011-11-232-73/+78
| | | | | | | | Also check for sufficient packet size.
| * cdg: skip packets that don't contain a cdg command.Justin Ruggles2011-11-232-1/+96
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * crcenc: add flagsAnton Khirnov2011-11-2312-1070/+626
| | | | | | | | | | | | | | | | | | | | AVFMT_NOTIMESTAMPS for crc, as it ignores the timestamps. AVFMT_VARIABLE_FPS for framecrc, as it prints dts. Many FATE changes, because avconv is no longer duplicating frames in those tests. Also added -vsync 0 for some tests to prevent avconv from dropping frames until it can be fixed more properly.
| * avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.Anton Khirnov2011-11-231-1/+2
| | | | | | | | | | Prevent avconv from duplicating or dropping frames for formats where it makes even less sense than usual, e.g. image2.
| * tiffenc: add a private option for selecting compression algorithmAnton Khirnov2011-11-231-1/+25
| |
| * md5enc: add flagsAnton Khirnov2011-11-232-1/+3
| | | | | | | | | | | | | | | | | | AVFMT_NOTIMESTAMPS for md5, as it ignores the timestamps. AVFMT_VARIABLE_FPS for framemd5, as it prints dts. -vsync 0 for the vp8 test is needed because with vsync 2 the timestamp guessing code gets confused by an altref frame that is never displayed and drops a frame later.
| * ARM: remove needless .text/.align directivesMans Rullgard2011-11-239-14/+0
| | | | | | | | | | | | | | The 'function' macro already includes the appropriate directives. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | doc: rewrite FATE documentation to be self-containedAlexander Strasser2011-11-241-13/+105
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tests: add a FATE configuration templateAlexander Strasser2011-11-241-0/+25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vsrc_mandelbrot: Fix vsrc_mandelbrot.c:358:85: warning: ‘epsilon’ may be ↵Michael Niedermayer2011-11-241-1/+1
| | | | | | | | | | | | used uninitialized in this function [-Wuninitialized] Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix indentionMichael Niedermayer2011-11-231-7/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix ffmpeg.c:1874:21: warning: unused variable ‘of’ ↵Michael Niedermayer2011-11-231-1/+0
| | | | | | | | | | | | [-Wunused-variable] Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | githowto: git is generally available as package in most distros.Michael Niedermayer2011-11-231-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: give more weight to the extension during probing if there is a id3Michael Niedermayer2011-11-231-3/+4
| | | | | | | | | | | | | | tag that is larger than the probe buffer. Fixes Ticket336 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: minor cleanup of av_probe_input_format3()Michael Niedermayer2011-11-231-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: Error out from avfilter_merge_formats() when there are duplicatesMichael Niedermayer2011-11-231-1/+6
| | | | | | | | | | | | instead of trying to continue. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_mp: rewrite vf_mp filter warning messageMichael Niedermayer2011-11-231-5/+4
| | | | | | | | | | Warning text by: Clément Bœsch <ubitux@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: dont write out of array for duplicate formats in ↵Michael Niedermayer2011-11-231-1/+3
| | | | | | | | | | | | | | | | | | avfilter_merge_formats() Note, this is a theoretical fix, iam not aware of a case where this function receives duplicates in its input. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-2364-866/+1390
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) aacdec: Fix PS in ADTS. avconv: Consistently use PIX_FMT_NONE. dsputil: use cpuflags in x86 emu_edge_core dsputil: use movups instead of movdqu in ff_emu_edge_core_sse() wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits. mov: Remove some redundant and obsolete comments. Add libavutil/mathematics.h #includes for INFINITY doxy: structure libavformat groups doxy: introduce an empty structure in libavcodec doxy: provide a start page and document libavutil doxy: cleanup pixfmt.h regtest: split video encode/decode tests into individual targets ARM: add explicit .arch and .fpu directives to asm.S pthread: do not touch has_b_frames avconv: cleanup the transcoding loop in output_packet(). avconv: split subtitle transcoding out of output_packet(). avconv: split video transcoding out of output_packet(). avconv: split audio transcoding out of output_packet(). avconv: reindent. avconv: move streamcopy-only code out of decoding loop. ... Conflicts: avconv.c libavcodec/aaccoder.c libavcodec/pthread.c libavcodec/version.h libavutil/audioconvert.h libavutil/avutil.h libavutil/mem.h tests/ref/vsynth1/dv tests/ref/vsynth1/mpeg2thread tests/ref/vsynth2/dv tests/ref/vsynth2/mpeg2thread Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Fix PS in ADTS.Alex Converse2011-11-221-1/+2
| | | | | | | | Fixes File1.aac and Bug 80.
| * avconv: Consistently use PIX_FMT_NONE.Alex Converse2011-11-221-2/+2
| | | | | | | | Use PIX_FMT_NONE instead of -1 when dealing with PixelFormat variables.
| * dsputil: use cpuflags in x86 emu_edge_coreJustin Ruggles2011-11-221-45/+46
| | | | | | | | avoids passing around the extra argument among all the macros it uses
| * dsputil: use movups instead of movdqu in ff_emu_edge_core_sse()Justin Ruggles2011-11-222-7/+7
| | | | | | | | | | This allows emulated_edge_mc_sse() and gmc_sse() to be used under AV_CPU_FLAG_SSE.
| * wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.Justin Ruggles2011-11-221-0/+3
| | | | | | | | | | | | | | | | The initial values are not checked against the number of block sizes. Initializing them to frame_len_bits will result in a block size index of 0 in these cases instead of something that might be out-of-range. Fixes Bug 81.
| * mov: Remove some redundant and obsolete comments.Alex Converse2011-11-221-21/+0
| |
| * Add libavutil/mathematics.h #includes for INFINITYMans Rullgard2011-11-223-0/+3
| | | | | | | | | | | | This fixes build errors in some environments. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * doxy: structure libavformat groupsLuca Barbato2011-11-222-1/+35
| |
| * doxy: introduce an empty structure in libavcodecLuca Barbato2011-11-222-1/+32
| |
| * doxy: provide a start page and document libavutilLuca Barbato2011-11-2219-16/+377
| | | | | | | | | | | | Introduce a basic layout, the subpages are currently left empty. Split libavutil in multiple groups as example of the structure
| * doxy: cleanup pixfmt.hLuca Barbato2011-11-221-6/+8
| | | | | | | | | | Remove the dubious warning about the header being private and add some formatting
| * regtest: split video encode/decode tests into individual targetsMans Rullgard2011-11-2229-76/+96
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ARM: add explicit .arch and .fpu directives to asm.SMans Rullgard2011-11-221-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | This prevents build errors when compiler and assembler default targets differ. Ideally each file would declare the highest level it requires. This is however not easily possible as it complicates assembling pre-armv6t2 code in Thumb-2 mode. HAVE_NEON is used as indicator for ARMv7-A since no other symbol exists for this and NEON is only available in this variant. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * pthread: do not touch has_b_framesJanne Grunau2011-11-223-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the thread count in frame level multithreading to has_b_frames as an additional delay causes more problems than it solves. For example inconsistent behaviour during timestamp calculation in libavformat. Thread count and frame level multithreading are both set by the user. If the additional delay caused by frame level multithreading needs to be considered in the calling code it has all information to take it into account. Should it become necessary to calculate a maximum delay inside libavcodec it should be exported as its own field and not reusing an existing field. Based on a patch by Michael Niedermayer. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * avconv: cleanup the transcoding loop in output_packet().Anton Khirnov2011-11-211-45/+14
| |