aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * h264: remove useless castMans Rullgard2011-12-121-1/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * proresdec: fix decode_slice() prototypeMans Rullgard2011-12-121-2/+3
| | | | | | | | | | | | | | | | Make the function prototype match the argument of AVCodecCntext.execute() and remove the cast hiding this mismatch. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | build: Disable avconv more completely while leaving the user the option to ↵Michael Niedermayer2011-12-132-3/+2
| | | | | | | | | | | | enable it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Update seek reference for added metadata to lavf tests.Reimar Döffinger2011-12-127-140/+140
| | | | | | | | | | | | | | As far as I could see the only change is increased pos values, which is as expected with additional metadata in the files. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lavf-regression: minimal metadata test.Reimar Döffinger2011-12-1210-16/+18
| | | | | | | | | | | | This tests writing the global "title" metadata. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | mxfdec: Set DTS and PTS on video packetsTomas Härdin2011-12-122-23/+117
| | | | | | | | | | | | This involves computing DTS/PTS from the index tables. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Only sort IndexTableSegments onceTomas Härdin2011-12-121-30/+28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Add Avid's essence element keyTomas Härdin2011-12-121-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Add support for Avid indexesTomas Härdin2011-12-121-12/+56
| | | | | | | | | | | | | | | | These indexes duplicate every entry and have the total size of the essence container as the last entry. This patch also computes the size of the packets when unknown. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Check slice_count before freeing slice_offset_entriesTomas Härdin2011-12-121-0/+1
| | | | | | | | | | | | This fixes SIGSEGV on sliceless (single stream) VBR files Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Bring back accumulated_offset that was removed in 5e67e3eTomas Härdin2011-12-121-1/+7
| | | | | | | | | | | | | | | | I thought it had to do with file offsets, but's actually the offset inside the essence container. In other words, unbreak multiple EditUnitByteCounts. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | timecode: rename internal ff_* symbols to avpriv_*.Clément Bœsch2011-12-127-19/+47
| | | | | | | | | | | | Those functions are shared between libs. Also fix a typo in function names: smtpe → smpte.
* | drawtext: allow burning the timecode.Clément Bœsch2011-12-122-1/+28
| |
* | timecode: add avpriv_timecode_to_string().Clément Bœsch2011-12-122-0/+27
| |
* | timecode: better input checks in init function.Clément Bœsch2011-12-121-7/+31
| |
* | cleanup: remove two extraneous semicolons.Clément Bœsch2011-12-122-2/+2
| |
* | ffmpeg: fix codecids with ffserver + ffmpeg + ffmMichael Niedermayer2011-12-121-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: Require 7 registers for the cabac asmMartin Storsjö2011-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | The change in 599b4c6ef didn't turn out to work properly on i386 on OS X, where it broke building with PIC enabled. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit f1dba9e4988e78738ad9065e4639b82b8355774a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | seek-test: use standard format specifiers in snprintf()Michael Niedermayer2011-12-121-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: replace forgotten avconv by ffmpeg in vsynth / asynth stuffMichael Niedermayer2011-12-121-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-1278-286/+388
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: cabac: replace explicit memory references with "m" operands avplay: don't request a stereo downmix wmapro: use av_float2int() lavc: avoid invalid memcpy() in avcodec_default_release_buffer() lavu: replace int/float punning functions lavfi: install libavfilter/vsrc_buffer.h Remove extraneous semicolons sdp: Restore the original mp4 format h264 extradata if converted rtpenc: Add support for mp4 format h264 rtpenc: Simplify code by introducing a separate end pointer movenc: Use the actual converted sample for RTP hinting Fix a bunch of common typos. Conflicts: doc/developer.texi doc/eval.texi doc/filters.texi doc/protocols.texi ffmpeg.c ffplay.c libavcodec/mpegvideo.h libavcodec/x86/cabac.h libavfilter/Makefile libavformat/avformat.h libavformat/cafdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/gxfenc.c libavformat/img2.c libavformat/movenc.c libavformat/mpegts.c libavformat/rtpenc_h264.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: cabac: replace explicit memory references with "m" operandsMans Rullgard2011-12-112-40/+36
| | | | | | | | | | | | | | | | This replaces the explicit offset(reg) memory references with "m" operands for the same locations. As a result, one fewer register operand is needed for these inline asm statements. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * avplay: don't request a stereo downmixJustin Ruggles2011-12-111-9/+0
| | | | | | | | Multi-channel output works just fine for me with SDL 1.2.14.
| * wmapro: use av_float2int()Mans Rullgard2011-12-111-2/+3
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavc: avoid invalid memcpy() in avcodec_default_release_buffer()Mans Rullgard2011-12-111-1/+2
| | | | | | | | | | | | | | | | | | | | When the buf and last pointers are equal, the FFSWAP() results in an invalid call to memcpy() with same source and destination on some targets. Although assigning a struct to itself is valid C99, gcc does not check for this before calling memcpy(). See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=32667 Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavu: replace int/float punning functionsMans Rullgard2011-12-1123-76/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing functions defined in intfloat_readwrite.[ch] are both slow and incorrect (infinities are not handled). This introduces a new header with fast, inline conversion functions using direct union punning assuming an IEEE-754 system, an assumption already made throughout the code. The one use of Intel/Motorola extended 80-bit format is replaced by simpler code sufficient under the present constraints (positive normal values). The old functions are marked deprecated and retained for compatibility. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavfi: install libavfilter/vsrc_buffer.hAndrey Utkin2011-12-111-1/+1
| | | | | | | | | | | | It declares API necessary for filtering apps. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Remove extraneous semicolonsMans Rullgard2011-12-118-77/+77
| | | | | | | | | | | | These semicolons cause invalid empty top-level declarations. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * sdp: Restore the original mp4 format h264 extradata if convertedMartin Storsjö2011-12-111-0/+17
| | | | | | | | | | | | | | | | | | If the sdp is generated before the rtp muxer is initialized (e.g. as when called from the rtsp muxer), this has to be done, otherwise the rtp muxer doesn't know that the input really is in mp4 format. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: Add support for mp4 format h264Luca Abeni2011-12-111-3/+28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: Simplify code by introducing a separate end pointerMartin Storsjö2011-12-111-5/+5
| | | | | | | | | | | | Also remove redundant parentheses. Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Use the actual converted sample for RTP hintingMartin Storsjö2011-12-113-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | If an annex b bitstream is muxed into mov, the actual written sample is reformatted to mp4 syntax before writing. Currently, the RTP hints that copy data from the normal video track, where the payload data might be offset compared to the original sample that the RTP hinting used (when 3 byte annex b startcodes have been converted into 4 byte mp4 format startcodes). Signed-off-by: Martin Storsjö <martin@martin.st>
| * Fix a bunch of common typos.Diego Biurrun2011-12-1151-82/+83
| |
* | seektest: floatfreeMichael Niedermayer2011-12-112-4/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/ffmpeg.texiMichael Niedermayer2011-12-111-7/+81
| | | | | | | | | | | | Merge changes done to avconv.texi since the last merge into ffmpeg.texi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support VP8 in NSV.Reimar Döffinger2011-12-111-0/+1
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | regressiontest: try mp2 for wtvMichael Niedermayer2011-12-113-18/+18
| | | | | | | | | | | | | | our ac3 decoder outputs different things on different platforms. Idea-by: Reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | regressiontest: try to fix wtvMichael Niedermayer2011-12-112-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | life: add mold, mold_color, life_color and death_color options.Clément Bœsch2011-12-112-21/+126
| |
* | life: add seed information in filter summary.Clément Bœsch2011-12-111-2/+3
| |
* | lavfi: add cellauto sourceStefano Sabatini2011-12-116-1/+489
| |
* | Add caf format regression test.Reimar Döffinger2011-12-112-0/+7
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Enable already existing rso regression test.Reimar Döffinger2011-12-111-0/+3
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add regression test for "sox" format muxer/demuxer.Reimar Döffinger2011-12-112-0/+7
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add wtv seek test.Reimar Döffinger2011-12-111-0/+41
| | | | | | | | | | | | | | I am not entirely sure the seek functionality is working correctly, there are some strange cases like successful seek but no dts value. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add wtv lavf regression test.Reimar Döffinger2011-12-112-0/+7
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | MAINTAINERS: extend syntax for entriesMichael Niedermayer2011-12-111-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Correct use of OSX to Mac OS X and properly format yasm providers on Mac OS XHanspeter Niederstrasser2011-12-114-9/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-1131-229/+342
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) Warn about avserver being broken. avconv: drop code for special handling of avserver streams. rawdec: don't set codec timebase. lavf doxy: add muxing stuff to lavf_encoding group lavf doxy: add demuxing stuff to lavf_decoding group lavf doxy: expand/reword metadata API doxy. lavf doxy: add installed headers to groups. lavf doxy: add avio groups into the lavf_io group. lavf doxy: rename lavf I/O group to lavf_io. lavf doxy: add metadata docs to the main lavf group ttadec: check channel count as read from extradata. Add CLJR encoding and decoding regression tests cljr: remove unused code flacdec: Support for tracks in cuesheet metadata block ptx: fix inverted check for sufficient data flac muxer: fix writing of file header and STREAMINFO header from extradata ptx: emit a warning on insufficient picture data utvideo: add fate tests covering all codec variants doc: update to refer to avconv doc: remove some stale entries from the faq ... Conflicts: Changelog avconv.c doc/avconv.texi doc/faq.texi doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/avcodec.h libavcodec/cljr.c libavformat/avformat.h libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Warn about avserver being broken.Anton Khirnov2011-12-104-4/+8
| | | | | | | | Also remove mentions of it from other avtools' manuals.