Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-04-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-04-08cosmetics: Fix indentationMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-04-08rtsp: Don't expose the MS-RTSP RTX data stream to the callerMartin Storsjö
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>
2011-04-24Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: Handle unicode file names on windows rtp: Rename the open/close functions to alloc/free Lowercase all ff* program names. Refer to ff* tools by their lowercase names. NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg. Replace `` by $() syntax in shell scripts. patcheck: Allow overiding grep program(s) through environment variables. NOT Pulled Remove stray libavcore and _g binary references. vorbis: Rename decoder/encoder files to follow general file naming scheme. aacenc: Fix whitespace after last commit. cook: Fix small typo in av_log_ask_for_sample message. aacenc: Finish 3GPP psymodel analysis for non mid/side cases. Remove RDFT dependency from AAC decoder. Add some debug log messages to AAC extradata Fix mov debug (u)int64_t format strings. bswap: use native types for av_bwap16(). doc: FLV muxing is supported. applehttp: Handle AES-128 encrypted streams Add a protocol handler for AES CBC decryption with PKCS7 padding doc: Mention that DragonFly BSD requires __BSD_VISIBLE set Conflicts: ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-24rtp: Rename the open/close functions to alloc/freeMartin Storsjö
This avoids clashes if we internally want to override the global open function. Signed-off-by: Martin Storsjö <martin@martin.st>
2011-04-04Merge remote branch 'qatar/master'Michael Niedermayer
* qatar/master: fate: fix partial run when no samples path is specified ARM: NEON fixed-point forward MDCT ARM: NEON fixed-point FFT lavf: bump minor version and add an APIChanges entry for avio changes avio: simplify url_open_dyn_buf_internal by using avio_alloc_context() avio: make url_fdopen internal. avio: make url_open_dyn_packet_buf internal. avio: avio_ prefix for url_close_dyn_buf avio: avio_ prefix for url_open_dyn_buf avio: introduce an AVIOContext.seekable field ac3enc: use generic fixed-point mdct lavfi: add fade filter Change yadif to not use out of picture lines. lavc: deprecate AVCodecContext.antialias_algo lavc: mark mb_qmin/mb_qmax for removal on next major bump. Conflicts: doc/filters.texi libavcodec/ac3enc_fixed.h libavcodec/ac3enc_float.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/vf_fade.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-04avio: avio_ prefix for url_close_dyn_bufAnton Khirnov
2011-04-04avio: avio_ prefix for url_open_dyn_bufAnton Khirnov
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-22avio: avio: avio_ prefixes for put_* functionsAnton Khirnov
In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 77eb5504d3b3e1047900382350e0bc5e0bfb16b5)
2011-02-21avio: avio: avio_ prefixes for put_* functionsAnton Khirnov
In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20avio: rename ByteIOContext to AVIOContext.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
2011-02-20avio: rename ByteIOContext to AVIOContext.Anton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2010-08-05rtpdec_xiph: Split packets in the depacketizerMartin Storsjö
The vorbis decoder doesn't handle more than one audio frame packed into the same AVPacket, so they need to be split in the depacketizer. Originally committed as revision 24704 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04rtpdec_xiph: Correct the bitmask for num_pktsMartin Storsjö
Originally committed as revision 24696 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-30Remove mostly unnecessary rtpdec_*.h files, store the declarations in one fileMartin Storsjö
Originally committed as revision 24596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-28rtpdec_xiph: Handle the sampling SDP parameterJosh Allmann
Patch by Josh Allmann, joshua dot allmann at gmail Originally committed as revision 24565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27rtpdec_xiph: Drop RTP packets that come in without a prior fragment start ↵Josh Allmann
marker. This can avoid segfaults in some cases. Patch by Josh Allmann, joshua dot allmann at gmail Originally committed as revision 24537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19rtpdec_xiph: Avoid extra memcpy in Xiph RTP depacketizerJosh Allmann
Patch by Josh Allmann, joshua dot allmann at gmail Originally committed as revision 24334 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-29rtpdec: Cleanup FMTP parsing code in Xiph RTP depacketizerJosh Allmann
Patch by Josh Allmann, joshua dot allmann at gmail Originally committed as revision 23860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-09Fix printf format warningsEli Friedman
patch by Eli Friedman <eli dot friedman at gmail dot com> Originally committed as revision 23547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20Remove explicit filename from Doxygen @file commands.Diego Biurrun
Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-15Remove useless assert(), since this can (in theora) be used for any XiphRonald S. Bultje
codec, so there's no reason to (invalidly) limit it to only Theora. Also fixes issue 1880 (compilation error on -DDEBUG). Originally committed as revision 22886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-03Replace all remaining occurrences of AVERROR_NOMEM withStefano Sabatini
AVERROR(ENOMEM). AVERROR_NOMEM is deprecated and will be dropped at the next libavutil major bump. Originally committed as revision 22791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02Change a case of CODEC_TYPE_ into AVMEDIA_TYPE_Martin Storsjö
This was accidentally overwritten in the recent merge of the theora/vorbis codepaths Originally committed as revision 22774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02Merge Vorbis / Theora depayloaders.Josh Allmann
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>. Originally committed as revision 22768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02Reindent after r22766.Josh Allmann
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>. Originally committed as revision 22767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02Rename functions / comments from "Theora" to "Xiph" where relevant.Josh Allmann
Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>. Originally committed as revision 22766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02Rename rtpdec_theora.[ch] to rtpdec_xiph.[ch], as a preparation for mergingJosh Allmann
the Vorbis / theora depacketizers. Patch by Josh Allmann <joshua DOT allmann AT gmail DOT com>. Originally committed as revision 22765 to svn://svn.ffmpeg.org/ffmpeg/trunk