summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '91d305790ea0f6fe0f54b48236da42181c39c18b'Michael Niedermayer2014-09-02
|\ | | | | | | | | | | | | | | | | | | * commit '91d305790ea0f6fe0f54b48236da42181c39c18b': get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE Conflicts: libavcodec/golomb.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLEDiego Biurrun2014-09-02
| | | | | | | | The HAVE_ prefix is reserved for macros set by configure.
* | Merge commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef'Michael Niedermayer2014-09-02
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef': flv: K&R formatting cosmetics Conflicts: libavcodec/flv.h libavcodec/flvdec.c libavcodec/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: K&R formatting cosmeticsGabriel Dume2014-09-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67'Michael Niedermayer2014-09-02
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67': asv: K&R formatting cosmetics Conflicts: libavcodec/asvdec.c libavcodec/asvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asv: K&R formatting cosmeticsGabriel Dume2014-09-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f'Michael Niedermayer2014-09-02
|\| | | | | | | | | | | | | | | | | | | * commit '74512f7e369da40e1148c92b58cd8e59f7737b8f': 8svx: Return proper error codes Conflicts: libavcodec/8svx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 8svx: Return proper error codesGabriel Dume2014-09-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | vf_deshake: Avoid doing a malloc+free for every single frame.Reimar Döffinger2014-09-02
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | vf_deshake: reduce stack usage.Reimar Döffinger2014-09-02
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | rangecoder-test: Allow running with small stack size.Reimar Döffinger2014-09-02
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | rl.h: Use on-stack temporary VLC tables instead of having them static.Reimar Döffinger2014-09-02
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | rl.h: remove deprecated and now unused vlc member.Reimar Döffinger2014-09-02
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | cmdutils: Add some whitespace when printing layoutsTobias Rapp2014-09-02
| | | | | | | | | | | | Adds some more whitespace between channel layout name and decomposition. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/swfdec: Use side data to communicate w/h changes to the decoderMichael Niedermayer2014-09-02
| | | | | | | | | | | | | | | | Fixes reading from freed data Fixes part of Ticket3539 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/rawdec: Support CODEC_CAP_PARAM_CHANGEMichael Niedermayer2014-09-02
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | segment: fix copying stream metadataMika Raento2014-09-02
| | | | | | | | | | | | To get mpegts metadata copied when segmenting. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | segment: use mpegts_flags instead of the deprecated resend_headers optionMika Raento2014-09-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/segment: Use avformat_alloc_output_context2()Michael Niedermayer2014-09-02
| | | | | | | | | | | | | | | | This avoids having to assign oformat, allows returning the correct error code and allocates priv_data Based on patch by: Mika Raento <mika.raento@elisa.fi> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support decoding of ImageJ png in avi.Carl Eugen Hoyos2014-09-02
| | | | | | | | Fixes ticket #3916.
* | segment: don't access outside seg->frames arrayMika Raento2014-09-02
| | | | | | | | | | | | Fixes wrong number of segments output and undefined memory access. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'Michael Niedermayer2014-09-02
|\| | | | | | | | | | | | | | | | | | | * commit 'e48d1ea541be4592ebac89875557407ca958b7a9': ismindex: improve diagnostics Conflicts: tools/ismindex.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: improve diagnosticsMika Raento2014-09-02
| | | | | | | | | | | | This improves error messages for completely and somewhat broken inputs. Signed-off-by: Martin Storsjö <martin@martin.st>
* | tools/normalize.py: both input and output file names are requiredMark Harris2014-09-02
| |
* | avutil/pixelutils: add small buffers testsClément Bœsch2014-09-02
| |
* | build sys: enable the decoding_encoding example under the ffmpeg/doc/examplesRong Yan2014-09-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix standalone compilation of the snow decoder.Carl Eugen Hoyos2014-09-01
| |
* | doc/filters.texi: fix filter name in examplesMark Harris2014-09-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add missing changelog entryThomas Volkert2014-09-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5'Michael Niedermayer2014-09-01
|\| | | | | | | | | | | | | * commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5': mpeg4videodec: Fix low_delay error message Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: Fix low_delay error messageGabriel Dume2014-09-01
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'Michael Niedermayer2014-09-01
|\| | | | | | | | | | | | | * commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2': aac_adtstoasc_bsf: Return proper error code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac_adtstoasc_bsf: Return proper error codeGabriel Dume2014-09-01
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'Michael Niedermayer2014-09-01
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae': dxva2: Clean up definition of _WIN32_WINNT Conflicts: libavcodec/dxva2.h See: 89946c8403752fbb26234d98f780188df8951a2e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxva2: Clean up definition of _WIN32_WINNTDiego Biurrun2014-09-01
| | | | | | | | | | | | Only set a value if _WIN32_WINNT is undefined or smaller than 0x0600. This is cleaner than unconditional definition and avoids a number of redefinition warnings. Also only define a value in one of the two dxva2 headers.
* | Merge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098'Michael Niedermayer2014-09-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098': dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer() Conflicts: libavcodec/dxva2_h264.c libavcodec/dxva2_mpeg2.c libavcodec/dxva2_vc1.c See: 64c53fa16aeca9cadd48ccf607803d6e4d26cc4d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()Diego Biurrun2014-09-01
| | | | | | | | This avoids related incompatible pointer type warnings.
* | ffmpeg: Enable compute_edt only when the subtitles are used for a output ↵Michael Niedermayer2014-09-01
| | | | | | | | | | | | | | | | | | stream instead of a filter Fixes/works around Ticket3768 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dvbsubdec: make compute_edt user settableMichael Niedermayer2014-09-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h261dec, ituh263dec: Move condition.Reimar Döffinger2014-09-01
| | | | | | | | | | | | | | | | Stops compiler from doing incredibly stupid things. With vsynth1-flv inner loop goes from 3501 to 3275 decicycles. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | h261dec, ituh263dec: ensure CLOSE_READER is done on error paths, too.Reimar Döffinger2014-09-01
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | h261dec, ituh263dec: Avoid unnecessary -1 inside inner loop.Reimar Döffinger2014-09-01
| | | | | | | | | | | | | | 3646 -> 3597 decicycles in inner loop when decoding vsynth1-flv. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | general: Fix usage of @floatTimothy Gu2014-09-01
| | | | | | | | | | | | | | makeinfo chokes on that. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | RELEASE_NOTES: mention libmodplug detection changeClément Bœsch2014-09-01
| |
* | lavu/avstring: check for overlong encodings in av_utf8_decode()Stefano Sabatini2014-09-01
| | | | | | | | Fix reopened trac ticket #1163.
* | build: use pkg-config to detect libmodplugClément Bœsch2014-09-01
| | | | | | | | Fix static build, at least for OSX.
* | Merge commit '37c46743ee42df1d6986ba3c996e3af5b95511f7'Michael Niedermayer2014-09-01
|\| | | | | | | | | | | | | | | * commit '37c46743ee42df1d6986ba3c996e3af5b95511f7': avcodec: fix missing doxygen comment marker See: 22652dc2b8d61d6a48e3f7815fa7f4b0adf0f12f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: fix missing doxygen comment markerMichael Niedermayer2014-09-01
| |
* | avformat/mpegts: favor DESC_types over probed codecsMichael Niedermayer2014-09-01
| | | | | | | | | | | | | | Fixes Ticket3766 Fixes dvb_teletext detection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: tests, use image2 instead of pgmyuvReynaldo H. Verdejo Pinochet2014-08-31
| | | | | | | | Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>