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
2014-03-29avformat/img2_alias_pix: rewrite probe functionMichael Niedermayer
Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-29avformat/img2dec: try to read PROBE_BUF_MIN instead of just enough for .pix ↵Michael Niedermayer
probing Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-29avformat/img2dec: Use avformat probing interface to identify format if it ↵Michael Niedermayer
has not been otherwise identified This is used only for distinguishing .pix formats for now. Which is the only case that has image2 demuxers currently Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-29avformat: add image2 brender pix demuxerMichael Niedermayer
Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-29avformat: add image2 alias pix demuxerMichael Niedermayer
Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-29avformat/img2dec: make image2dec capable to be used from seperate demuxersMichael Niedermayer
Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28avfilter/lavfutils: call av_find_stream_info() before reading various ↵Michael Niedermayer
information about the stream No testcase with unmodified source is known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28cmdutils/filter_codec_opts: do not discard all options for CODEC_ID_NONEMichael Niedermayer
This fixes cases where the codec is detect later than the stream creation No testcase with unmodified source known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28movenc: Add dvd subtitle supportJohn Stebbins
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-28fate/aliaspix: Use standard test sampleMichael Niedermayer
This also uses samples with odd resolution which should provide better coverage Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: fate: add a bmpparser test Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28Merge commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410'Michael Niedermayer
* commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410': bmp: add a standalone parser Conflicts: Changelog libavcodec/bmp_parser.c libavcodec/version.h See: 011ce89dba5c0c764abc5f39acb6368f580742e3 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28Merge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022'Michael Niedermayer
* commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022': fate: add XBM tests Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28avcodec/xbmdec: support X10 formatMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28avcodec/xbmdec: merge ptr increase into dereferenceMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28Merge commit '678082b409aca711f9cf991df6b0200116489322'Michael Niedermayer
* commit '678082b409aca711f9cf991df6b0200116489322': X-Bitmap decoder Conflicts: Changelog libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h libavcodec/xbmdec.c See: a0340dfbd78df7639715056937011d2d414aaeed Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28Merge commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4'Michael Niedermayer
* commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4': xbm: use av_frame_free on close Conflicts: libavcodec/xbmenc.c No change as the buggy code is not part of FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28Merge commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8'Michael Niedermayer
* commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8': fate: add PAF audio and video tests Conflicts: tests/fate/audio.mak tests/fate/video.mak See: 101615c7ff37afe5e6a951838cbbbb92b7485473 See: 409cc4588329633326b32a5245b085c543689471 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'Michael Niedermayer
* commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033': PAF demuxer and decoder Conflicts: Changelog doc/general.texi libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/paf.c libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/paf.c libavformat/version.h See: 7de4a16508cb9bd2d40855f7114dea14329ef62a, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28Merge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8'Michael Niedermayer
* commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8': lavc: restore copy_block{4,16} functions Conflicts: libavcodec/copy_block.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28cmdutils: Mark exit_program as av_noreturnLuca Barbato
2014-03-28dshow: show device name when outputting buffer overflow log messagerogerdpack
Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28fate: add a bmpparser testVittorio Giovara
2014-03-28bmp: add a standalone parserPaul B Mahol
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-28avcodec/libx264: move where x264opts is applied down so it isnt overridden ↵Michael Niedermayer
by avctx & defaults fixes x264opts opengop=1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28fate: add XBM testsVittorio Giovara
2014-03-28X-Bitmap decoderVittorio Giovara
2014-03-28xbm: use av_frame_free on closeVittorio Giovara
2014-03-28fate: add PAF audio and video testsPaul B Mahol
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-28PAF demuxer and decoderPaul B Mahol
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-28lavc: restore copy_block{4,16} functionsVittorio Giovara
They were removed in 9e31729d692f1e721b7ed1a3a0f51b68c064d68f.
2014-03-28x86: convert DNxHDenc inline asm to yasmTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28dnxhdenc: make get_pixel_8x4_sym accept ptrdiff_t as strideTimothy Gu
Signed-off-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28avcodec: Make ff_print_debug_info2() independant of Picture structMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28avcodec/brenderpix: propagate error codesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28avcodec/brenderpix: remove unused variableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: fate: add BRender PIX tests Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'Michael Niedermayer
* commit 'ae17878fb2ab100264226c84c58f5b95a703312f': BRender PIX image decoder Conflicts: doc/general.texi libavcodec/Makefile libavcodec/version.h See: 492a5f835c59ab7c2e347d3579d8bf6148ae0a0, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27Merge commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7'Michael Niedermayer
* commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7': arm: build: Maintain decoder objects separate from infrastructure objects Conflicts: libavcodec/arm/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27fate: add BRender PIX testsVittorio Giovara
2014-03-27BRender PIX image decoderAleksi Nurmi
Further enhancements by Vittorio Giovara and Paul B Mahol. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-27arm: build: Maintain decoder objects separate from infrastructure objectsDiego Biurrun
2014-03-27avcodec/vp7: Fix null pointer dereference in vp7_decode_frame_header()Michael Niedermayer
This simply copies the "interframe without a prior keyframe" check thats done later into vp7_decode_frame_header() Found-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27configure: fix VP7 standalone buildMichael Niedermayer
Found-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27Fix spelling errors in texi files: more informations --> more information ↵Andreas Cadhalpun
allows to --> allows one to Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27Fix texinfo error due to wrong @subsubsectionAndreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: fate: add Alias PIX tests Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'Michael Niedermayer
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b': Alias PIX image encoder and decoder Conflicts: Changelog libavcodec/allcodecs.c libavcodec/version.h libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27libavformat/aviobuf: keep track of the original buffer-size and restore it ↵Michael Niedermayer
after probe/ensure-seekback Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27avformat/aviobuf: ffio_ensure_seekback: only copy the initialized part of ↵Michael Niedermayer
the buffer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>