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-10-31utils: fix rounding of micro secondsMichael Niedermayer
Found-by: Johan Wessfeldt <johan.wessfeldt@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31lavf/avienc: fix/extend error message, in case of too large number of ↵Stefano Sabatini
skipped frames
2012-10-31lavf/avienc: enable debug logStefano Sabatini
2012-10-31wavenc: fix curruption of metadataMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: pixfmt: support more yuva formats swscale: support gray to 9bit and 10bit formats configure: rewrite print_config() function using awk FATE: fix (AD)PCM test dependencies broken in e519990 Use ptrdiff_t instead of int for intra pred "stride" function parameter. x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes. Conflicts: libavcodec/h264pred.c libavcodec/h264pred_template.c libavutil/pixfmt.h libswscale/swscale_unscaled.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a'Michael Niedermayer
* commit '08b028c18dc31b6de741861b9555669dcca4d12a': Remove INIT_AVX from x86inc.asm. Remove usage of INIT_AVX in h264_intrapred_10bit.asm. dv: fix indentation Conflicts: libavformat/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30Merge commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8'Michael Niedermayer
* commit '14f031d7ecfabba0ef02776d4516aa3dcb7c40d8': dv: use AVStream.index instead of abusing AVStream.id lavfi: add ashowinfo filter avcodec: Add a RFC 3389 comfort noise codec lpc: Add a function for calculating reflection coefficients from samples lpc: Add a function for calculating reflection coefficients from autocorrelation coefficients lavr: document upper bound on number of output samples. lavr: add general API usage doxy indeo3: remove duplicate capabilities line. fate: ac3: Add dependencies Conflicts: Changelog doc/filters.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavfilter/Makefile libavfilter/af_ashowinfo.c libavfilter/allfilters.c libavfilter/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30Merge commit '381dc1a5ec0925b281c573457c413ae643567086'Michael Niedermayer
* commit '381dc1a5ec0925b281c573457c413ae643567086': fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups fate: Add shorthands for acodec PCM and ADPCM tests avconv: Drop unused function argument from do_video_stats() cmdutils: Conditionally compile libswscale-related bits aacenc: Drop some unused function arguments rtsp: Avoid a cast when calling strtol nut: support textual data nutenc: verbosely report unsupported negative pts Conflicts: cmdutils.c ffmpeg.c libavformat/nut.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30pixfmt: support more yuva formatsLuca Barbato
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-10-30mp3dec: remove unused variableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30dv: fix indentationAnton Khirnov
2012-10-30dv: use AVStream.index instead of abusing AVStream.idAnton Khirnov
2012-10-29rtsp: Avoid a cast when calling strtolMartin Storsjö
This gets rid of this warning: libavformat/rtsp.c: In function ‘rtsp_parse_transport’: libavformat/rtsp.c:794: warning: cast discards qualifiers from pointer target type Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-29movenc: Add required 'prof' atom to 'tapt' atom set.Tim Nicholson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavc: add CODEC_CAP_DR1 to all video decoders missing them rtpdec: Cosmetic cleanup Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29nut: support textual dataLuca Barbato
Plain text (utf8 encoded) data can be muxed and demuxed in nut.
2012-10-29nutenc: verbosely report unsupported negative ptsLuca Barbato
Additionally use the correct error number.
2012-10-29smoothstreamingenc: check return value of mkdir()Michael Niedermayer
Fixes CID732188 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29smoothstreamingenc: fix integer overflowMichael Niedermayer
Fixes CID732248 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29cafdec: fix parsing of chunks which may have unused dataPaul B Mahol
Specification mentions 'strg', 'mark', 'regn', 'info', .. chunks to have data section size larger than chunk's current meaningful content in order to reserve room for additional data. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-28lavf/srtenc: add AVFMT_TS_NONSTRICT flag.Clément Bœsch
There is not really a problem in having two events at the same time. Even if it's not perfectly correct, it helps remuxing more files (typically our FATE sample).
2012-10-28rtpdec: Cosmetic cleanupMartin Storsjö
Mainly clean up the RTP statistics code, plus a few other obviously misindentend lines. Remove some useless comments, de-doxygenize some comments, add spacing around operators and fix a typo. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-28parse ID3v2 chaptersPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-28Add an additional AAC TwoCC.Carl Eugen Hoyos
Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx Originally committed to vlc by Jean-Baptiste.
2012-10-28movenc: add more metadata typesbbraun
Fixes Ticket1052 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: yuv4mpeg: reject unsupported codecs nutenc: K&R formatting cosmetics assdec: fix qsort() callback signature configure: detect sparc64 automatically vp8: fix memset() crossing array boundary h264: fix invalid pointer arithmetic amrwbdec: fix invalid pointer arithmetic Conflicts: libavformat/nutenc.c libavformat/yuv4mpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-28Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'Michael Niedermayer
* commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26': avio: fix pointer type mismatches in avio_enum_protocols() avserver: use socklen_t where appropriate udp: use socklen_t where appropriate network: use HAVE_THREADS instead of local hack af_channelmap: remove stray enum declaration buffersink: remove stray semicolon after function definition Conflicts: libavformat/avio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-28yuv4mpeg: reject unsupported codecsLuca Barbato
The muxer already rejects unsupported pixel formats, reject also unsupported codecs to prevent dangerous misuses.
2012-10-28nutenc: K&R formatting cosmeticsLuca Barbato
2012-10-28swfenc: zero fifo after freeingMichael Niedermayer
Fixes CID602000 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27riff: support 0xa100 TwoCCPiotr Bandurski
fixes decoding of file "4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav" from ticket #1856 (0xa100 = Comverse Infosys Ltd. G723 1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27assdec: fix qsort() callback signatureMans Rullgard
This changes the event_cmp() function to the correct signature, avoiding an ugly cast. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-27avio: fix pointer type mismatches in avio_enum_protocols()Mans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-27udp: use socklen_t where appropriateMans Rullgard
getsockname() takes a pointer to socklen_t which is not necessarily int. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-27network: use HAVE_THREADS instead of local hackMans Rullgard
HAVE_THREADS is set in config.h if pthreads or w32threads is available, which presumably the proper condition here. Also fixes undefined behaviour in preprocessor directives. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-27Update my email addressMichael Bradshaw
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26lavf/srtenc: allow zero duration events.Clément Bœsch
This is useful when you want to remux events with zero (or too small) durations.
2012-10-26bit: check av_new_packet() return valuePaul B Mahol
Fixes CID703626. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-26rmdec: fix null derefercneMichael Niedermayer
Fixes CID733714 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26rmdec: use av_assert for audio_pkt_cntMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: configure: sanitise sparc vis check configure: recognise more sparc variants as --cpu argument build: Include HEADERS-yes in the HEADERS variable pcm: change references to raw to pcm ffv1: set the range coder state in decode_slice_header pcmdec: change default of channels parameter to 1 Conflicts: libavformat/pcmdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26caf muxer: write metadataPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-26Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'Michael Niedermayer
* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3': avconv: fix bitrate report when writing to /dev/null avfilter: fix graphparser memleaks on error paths rawdec: remove ff_raw_read_header pcmdec: remove dependency from rawdec g722: refactor out of rawdec.c rawvideo: use a specific read_header Conflicts: ffmpeg.c libavformat/Makefile libavformat/rawdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26aiffdec: read ID3 attached picturesMatthieu Bouron
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26cafenc: make .long_name match demuxerPaul B Mahol
While here reindent .codec_tag . Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-26lvfdec: cosmetics: fix identationPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-25pcm: change references to raw to pcmLuca Barbato
2012-10-25rawdec: remove ff_raw_read_headerLuca Barbato
It is not used anymore and is a kludge.
2012-10-25pcmdec: remove dependency from rawdecLuca Barbato
The code shared is not actually shared with anything else.
2012-10-25g722: refactor out of rawdec.cLuca Barbato