summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: snow: split snow in snowdec and snowenc tiffenc: deprecate using compression_level swscale: fix failing fate tests. swscale: add support for planar RGB input. h264: add support for decoding planar RGB images. Clean up swscale pixfmt macros using av_pix_fmt_descriptors[]. pixfmt: add planar RGB formats. Conflicts: libavcodec/h264.c libavcodec/snow.c libavcodec/utils.c libavutil/avutil.h libavutil/pixdesc.c libavutil/pixfmt.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * snow: split snow in snowdec and snowencLuca Barbato2011-11-24
| | | | | | | | | | The common non inlined code goes in snow.c, the common inlined code in snow.h, tables move in snowdata.h (included only by snow.c)
| * tiffenc: deprecate using compression_levelAnton Khirnov2011-11-24
| |
| * swscale: fix failing fate tests.Ronald S. Bultje2011-11-24
| | | | | | | | isGray() is left as a FIXME for later.
| * swscale: add support for planar RGB input.Ronald S. Bultje2011-11-24
| |
| * h264: add support for decoding planar RGB images.Ronald S. Bultje2011-11-24
| |
| * Clean up swscale pixfmt macros using av_pix_fmt_descriptors[].Ronald S. Bultje2011-11-24
| |
| * pixfmt: add planar RGB formats.Ronald S. Bultje2011-11-24
| |
* | Do not claim that every unknown rm stream is a video stream.Carl Eugen Hoyos2011-11-25
| | | | | | | | | | | | | | | | Also reduce verbosity for the unsupported stream message, use an AVFormatContext for av_log and and print the tag of the unknown stream. Improves ticket #672.
* | indeo3: fix null pointer dereference in vulnerable.movMichael Niedermayer2011-11-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | yuv pixel formats support in openjpeg decoder + 10bit supportAlex Zhukov2011-11-24
| | | | | | | | | | | | Signed-off-by: Alex Zhukov <zhukov.alex@gmail.com> Reviewed-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add option -n to exit if output file exists.Carl Eugen Hoyos2011-11-24
| |
* | swr: fix invalid sample format message.Clément Bœsch2011-11-24
| | | | | | | | | | If the sample format is invalid, av_get_sample_fmt_name() will always return NULL.
* | swr: use native planar sample formats.Clément Bœsch2011-11-24
| |
* | lavu: add av_get_alt_sample_fmt().Clément Bœsch2011-11-24
| |
* | swr: fix test program.Clément Bœsch2011-11-24
| | | | | | | | | | | | | | 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-24
| | | | | | | | | | | | 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-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix adts format creation in aac+ encoder modified: libavcodec/libaacplus.cSergiy Gur'yev2011-11-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: rewrite vsync / notimestamps handlingMichael Niedermayer2011-11-24
| | | | | | | | | | | | | | | | | | | | 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-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-23
| | | | | | | | Based on code by Stefano Sabatini.
| * libavutil: add planar sample formats and av_sample_fmt_is_planar()Justin Ruggles2011-11-23
| |
| * avconv: fix segfault at EOF with delayed picturesJanne Grunau2011-11-24
| | | | | | | | | | | | 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-23
| |
| * avconv: remove a now unused parameter from output_packet().Anton Khirnov2011-11-23
| |
| * avconv: formatting fixes in output_packet()Anton Khirnov2011-11-23
| |
| * avconv: declare some variables in blocks where they are usedAnton Khirnov2011-11-23
| |
| * avconv: use the same behavior when decoding audio/video/subsAnton Khirnov2011-11-23
| | | | | | | | | | | | | | 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-23
| | | | | | | | Also check for sufficient packet size.
| * cdg: skip packets that don't contain a cdg command.Justin Ruggles2011-11-23
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * crcenc: add flagsAnton Khirnov2011-11-23
| | | | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | 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-23
| |
| * md5enc: add flagsAnton Khirnov2011-11-23
| | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | 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-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tests: add a FATE configuration templateAlexander Strasser2011-11-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vsrc_mandelbrot: Fix vsrc_mandelbrot.c:358:85: warning: ‘epsilon’ may be ↵Michael Niedermayer2011-11-24
| | | | | | | | | | | | used uninitialized in this function [-Wuninitialized] Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix indentionMichael Niedermayer2011-11-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: Fix ffmpeg.c:1874:21: warning: unused variable ‘of’ ↵Michael Niedermayer2011-11-23
| | | | | | | | | | | | [-Wunused-variable] Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | githowto: git is generally available as package in most distros.Michael Niedermayer2011-11-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: give more weight to the extension during probing if there is a id3Michael Niedermayer2011-11-23
| | | | | | | | | | | | | | 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-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: Error out from avfilter_merge_formats() when there are duplicatesMichael Niedermayer2011-11-23
| | | | | | | | | | | | instead of trying to continue. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_mp: rewrite vf_mp filter warning messageMichael Niedermayer2011-11-23
| | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | 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-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-22
| | | | | | | | Fixes File1.aac and Bug 80.
| * avconv: Consistently use PIX_FMT_NONE.Alex Converse2011-11-22
| | | | | | | | Use PIX_FMT_NONE instead of -1 when dealing with PixelFormat variables.