aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | pan: fix uninitialized channel_id variable.Clément Bœsch2012-02-151-1/+1
| | | | | | | | | | | | Fix broken parsing with pan=2:FL=FR:FR=FL and similar.
* | | audioconvert: consistent use of FF_ARRAY_ELEMS for channel_layout_map.Clément Bœsch2012-02-151-4/+3
| | |
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-1528-156/+1084
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) CDXL demuxer and decoder hls: Re-add legacy applehttp name to preserve interface compatibility. hlsproto: Rename the functions and context hlsproto: Encourage users to try the hls demuxer instead of the proto doc: Move the hls protocol section into the right place libavformat: Rename the applehttp protocol to hls hls: Rename the functions and context libavformat: Rename the applehttp demuxer to hls rtpdec: Support H263 in RFC 2190 format rv30: check block type validity ttadec: CRC checking movenc: Support muxing VC1 avconv: Don't split out inline sequence headers when stream copying VC1 rv34: handle size changes during frame multithreading rv40: prevent undefined signed overflow in rv40_loop_filter() rv34: use AVERROR return values in ff_rv34_decode_frame() rv34: use uint16_t for RV34DecContext.deblock_coefs librtmp: Add "lib" prefix to librtmp URLProtocol declarations. movenc: Use defines instead of hardcoded numbers for RTCP types smjpegdec: implement seeking ... Conflicts: Changelog doc/general.texi libavcodec/avcodec.h libavcodec/rv30.c libavcodec/tta.c libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/version.h libswscale/x86/swscale_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | CDXL demuxer and decoderPaul B Mahol2012-02-1411-2/+460
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | hls: Re-add legacy applehttp name to preserve interface compatibility.Alex Converse2012-02-141-1/+1
| | |
| * | hlsproto: Rename the functions and contextMartin Storsjö2012-02-141-20/+20
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | hlsproto: Encourage users to try the hls demuxer instead of the protoMartin Storsjö2012-02-142-0/+11
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | doc: Move the hls protocol section into the right placeMartin Storsjö2012-02-141-15/+15
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | libavformat: Rename the applehttp protocol to hlsMartin Storsjö2012-02-145-8/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the old protocol name around for backwards compatibility until the next bump. Deprecate the method of implicitly assuming the nested protocol. For applehttp://server/path, it might have felt logical, but supporting hls://server/path isn't quite as intuitive. Therefore only support hls+http://server/path from now on. Using this protocol at all is discouraged, since the hls demuxer is more complete and fits into the architecture better. There have been cases where the protocol implementation worked better than the demuxer, but this should no longer be the case. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | hls: Rename the functions and contextMartin Storsjö2012-02-141-22/+22
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | libavformat: Rename the applehttp demuxer to hlsMartin Storsjö2012-02-143-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | When this demuxer was created, there didn't seem to be any consensus of a common short name for this protocol. Now the consensus seems to be to call it hls. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | rtpdec: Support H263 in RFC 2190 formatMartin Storsjö2012-02-144-0/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is different from the "modern" RTP payload formats for H263 as defined by RFC 4629, 2429 and 3555. According to the newer RFCs, this old one is to be considered deprecated and only be used for interoperating with legacy systems. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | rv30: check block type validityJanne Grunau2012-02-141-1/+1
| | | | | | | | | | | | | | | Prevents crashes with the fuzzed samples from bugs 88, 89 and 125 after "golomb: avoid infinite loop on all-zero input".
| * | ttadec: CRC checkingPaul B Mahol2012-02-141-0/+33
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * | movenc: Support muxing VC1Martin Storsjö2012-02-142-1/+175
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | avconv: Don't split out inline sequence headers when stream copying VC1Martin Storsjö2012-02-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is required when stream copying VC1 in ismv - there's one global header in the moov atom, but keyframes have a separate sequence header prepended. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | rv34: handle size changes during frame multithreadingJanne Grunau2012-02-141-64/+82
| | | | | | | | | | | | | | | Factors all context dynamic memory handling to its own functions. Fixes bug 220.
| * | rv40: prevent undefined signed overflow in rv40_loop_filter()Janne Grunau2012-02-141-2/+3
| | |
| * | rv34: use AVERROR return values in ff_rv34_decode_frame()Janne Grunau2012-02-141-4/+8
| | | | | | | | | | | | Also adds an error message.
| * | rv34: use uint16_t for RV34DecContext.deblock_coefsJanne Grunau2012-02-141-1/+1
| | | | | | | | | | | | It is used as bitfield with 16 entries.
| * | librtmp: Add "lib" prefix to librtmp URLProtocol declarations.Diego Biurrun2012-02-144-22/+21
| | | | | | | | | | | | | | | | | | This allows easily differentiating between both implementations within the build system and combining the native implementation for plain RTMP with librtmp for the RTMPE, RTMPS, RTMPT, RTMPTE protocol variants.
| * | movenc: Use defines instead of hardcoded numbers for RTCP typesMartin Storsjö2012-02-141-1/+2
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | smjpegdec: implement seekingPaul B Mahol2012-02-141-0/+5
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * | swscale: Remove some write-only variables related to alpha handling.Diego Biurrun2012-02-142-15/+0
| | |
* | | swscale: enable some more SIMD functions.Michael Niedermayer2012-02-151-3/+3
| | | | | | | | | | | | | | | | | | They no longer just segfault. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | ffv1: PIX_FMT_GRAY8 supportPaul B Mahol2012-02-151-4/+9
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavfi/silencedetect: use av_ts2timestr() macro.Clément Bœsch2012-02-151-8/+8
| | |
* | | swscale: yuv2422_2_c_template() add cliping.Michael Niedermayer2012-02-141-0/+7
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swscale: Add cliping to yuv2422_1_c_template()Michael Niedermayer2012-02-141-0/+14
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swscale: Fix rounding in yuv2mono_1_c_template()Michael Niedermayer2012-02-141-8/+8
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swscale: Fix rounding in yuv2rgb_1_c_template()Michael Niedermayer2012-02-141-12/+12
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | swscale: yuv2422_1_c_template: fix roundingMichael Niedermayer2012-02-141-8/+8
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavfi/ashowinfo: only print checksum for the existing planesStefano Sabatini2012-02-141-4/+6
| | | | | | | | | | | | Make the output a bit nicer.
* | | lavfi/showinfo: only print checksum for the existing planesStefano Sabatini2012-02-141-2/+6
| | | | | | | | | | | | Make the output a bit nicer.
* | | lavfi/*showinfo: use av_ts2* macros in showinfo and ashowinfoStefano Sabatini2012-02-142-4/+6
| | |
* | | ffmpeg.c: implement -debug_ts optionStefano Sabatini2012-02-142-4/+35
| | | | | | | | | | | | Mostly useful for debugging purposes.
* | | Fix compilation with old yasm that does not support AVX.Carl Eugen Hoyos2012-02-142-3/+7
| | |
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-143-2/+7
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: fix crashes in yuv2yuvX on x86-32. sunrast: Add fate test for gray8. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | swscale: fix crashes in yuv2yuvX on x86-32.Ronald S. Bultje2012-02-131-2/+2
| | | | | | | | | | | | | | | | | | They were introduced in an earlier commit that introduced use of named arguments. One cause was a typo, a second cause appears to be a bug in x264asm that I work around by not using named arguments.
| * | sunrast: Add fate test for gray8.Aneesh Dogra2012-02-132-0/+5
| | | | | | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | | lavc: add missing PIX_FMT_YUVA444PPaul B Mahol2012-02-141-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-1427-192/+132
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec: Use 4 byte startcodes for H.264 matroskadec: Mark variable as av_unused. Move some conditionally used variables into the block where they are used. Drop some completely unnecessary av_unused attributes. swscale: Remove unused variable alpMmxFilter. Drop unnecessary av_uninit attributes from some variable declarations. movenc: Support muxing wmapro in ismv/isma mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written swscale: move YUV2PACKED16WRAPPER() macro down to where it is used. swscale: handle gray16 as a "planar" YUV format (Y-only, of course). swscale: use yuv2packed1() functions for unscaled chroma also. swscale: fix incorrect chroma bias in yuv2rgb48_1_c(). swscale: fix invalid memory accesses in yuvpacked1() functions. Move PS2 MMI code below the mips subdirectory, where it belongs. mips: Move MMI function declarations to a header. build: Set correct dependencies for rtmp* protocols implemented by librtmp. Conflicts: libavcodec/ac3enc_template.c libavformat/mpegtsenc.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | rtpdec: Use 4 byte startcodes for H.264Matthew Szatmary2012-02-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | If muxing into mpegts, 4 byte startcodes for the first NAL of an access unit is required. Thus it is simplest for the RTP depacketizer to just use 4 byte startcodes everywhere. Signed-off-by: Martin Storsjö <martin@martin.st>
| * | matroskadec: Mark variable as av_unused.Diego Biurrun2012-02-131-1/+1
| | | | | | | | | | | | This avoids unused variable warnings when zlib/bzlib are not available.
| * | Move some conditionally used variables into the block where they are used.Diego Biurrun2012-02-133-3/+4
| | | | | | | | | | | | This allows dropping the av_unused argument from them.
| * | Drop some completely unnecessary av_unused attributes.Diego Biurrun2012-02-134-7/+5
| | |
| * | swscale: Remove unused variable alpMmxFilter.Diego Biurrun2012-02-131-1/+0
| | |
| * | Drop unnecessary av_uninit attributes from some variable declarations.Diego Biurrun2012-02-136-10/+8
| | | | | | | | | | | | Recent versions of gcc (4.4+) no longer give false positive warnings.
| * | movenc: Support muxing wmapro in ismv/ismaMartin Storsjö2012-02-131-2/+17
| | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * | mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be writtenMartin Storsjö2012-02-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | When segmenting the output from the mpegts muxer, one can now set this option when cutting to a new segment, to make sure the next segment starts with PAT/PMT/SDT. Signed-off-by: Martin Storsjö <martin@martin.st>