summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'Hendrik Leppkes2015-09-08
|\ | | | | | | | | | | | | * commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba': lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fieldsVittorio Giovara2015-09-07
| | | | | | | | | | | | The new fields can be accessed directly and are more intelligible. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '6b3ef7f080293956b2e5212b83135c6b051212e9'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit '6b3ef7f080293956b2e5212b83135c6b051212e9': lavu: Remove bit packing from AVComponentDescriptor Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavu: Remove bit packing from AVComponentDescriptorVittorio Giovara2015-09-07
| | | | | | | | | | | | | | | | | | There is no practical benefit in having this structure elements bit packed given the size of the structure and its usage. Change types from uint16_t (packed) to plain int in order to simplify modifying the structure and accessing its fields. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'b8b5d8274471129f122858bc74ad09284dae6ab7'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit 'b8b5d8274471129f122858bc74ad09284dae6ab7': lavu: extend size of the AVPixFmtDescriptor.flags field Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavu: extend size of the AVPixFmtDescriptor.flags fieldwm42015-09-07
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '77cf23668991bfd1fb69339f13e1511b4186b7b3'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit '77cf23668991bfd1fb69339f13e1511b4186b7b3': asfdec: alloc enough space for storing name in asf_read_metadata_obj Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * asfdec: alloc enough space for storing name in asf_read_metadata_objAlexandra Hájková2015-09-06
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit '7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4': mov: Allow more than one keyframe per trun Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mov: Allow more than one keyframe per trunMartin Storsjö2015-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous restriction was partially designed to fix certain (broken) samples from bug 215. There should be no restriction on the number of keyframes per fragment or trun. The spec suggests that all frames lacking MOV_FRAG_SAMPLE_FLAG_IS_NON_SYNC are key frames, but we require the flag MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES to be unset as well. This works for (possibly broken) media that never sets the NON_SYNC flag and should also be correct for any spec-compliant file. For files that never set either of the flags, all samples are marked as keyframes. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946': dxtory: Unify and rework the decoding routines Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dxtory: Unify and rework the decoding routinesLuca Barbato2015-09-06
| | | | | | | | | | | | | | Do not make many assumption on the dimension of the slices and just try to decode additional lines if there is enough data left. Decodes all the samples kindly provided by ultramage.
* | Merge commit '3cdda78deb19b39dbbf8961ae0aec44dbb19bf6d'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit '3cdda78deb19b39dbbf8961ae0aec44dbb19bf6d': checkasm: add unit tests for v210enc Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * checkasm: add unit tests for v210encHenrik Gramner2015-09-06
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '599fe93a840397f551d94db406d0bad42b46b94b'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit '599fe93a840397f551d94db406d0bad42b46b94b': riff: Add AVj2 fourcc for Avid jpeg2000 Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * riff: Add AVj2 fourcc for Avid jpeg2000Vittorio Giovara2015-09-04
| |
* | Merge commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be': dxtory: Factorize the buffer loading Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dxtory: Factorize the buffer loadingLuca Barbato2015-09-04
| | | | | | | | And the checks nearby it.
* | Merge commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac': dxtory: Factorize slice size checks Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dxtory: Factorize slice size checksLuca Barbato2015-09-04
| | | | | | | | They are always the same.
* | Merge commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25': fraps: increase vlc nb_bits Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * fraps: increase vlc nb_bitsMichael Niedermayer2015-09-03
| | | | | | | | | | Sample-Id: fraps_bug_huff.avi Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '741d353ab9cb47fe864e60552bf7b9af7aaa735b'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit '741d353ab9cb47fe864e60552bf7b9af7aaa735b': huffman: allow specifying nb_bits to ff_huff_build_tree() Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * huffman: allow specifying nb_bits to ff_huff_build_tree()Michael Niedermayer2015-09-03
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '26960aa1cd865e5dc55c67fb2ff9f0629e4d1bda'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit '26960aa1cd865e5dc55c67fb2ff9f0629e4d1bda': huffman: increase bits constant Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * huffman: increase bits constantMichael Niedermayer2015-09-03
| | | | | | | | | | | | Bug-ID: ffmpeg ticket 2593 Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '5a19bce2ff2b61602889392bec747ce81d1e9a1b'Hendrik Leppkes2015-09-08
|\| | | | | | | | | | | | | * commit '5a19bce2ff2b61602889392bec747ce81d1e9a1b': huffman: use a named identifer for the bits constant Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * huffman: use a named identifer for the bits constantMichael Niedermayer2015-09-03
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avfilter: add extrastereo filterPaul B Mahol2015-09-08
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/dxv: Support more real-world old version samples.Carl Eugen Hoyos2015-09-08
| |
* | lavc/dxv: Silence "Multiple ff_thread_finish_setup() calls" warnings.Carl Eugen Hoyos2015-09-08
| |
* | configure: Reenable colorized warnings and check for tput's existenceTimothy Gu2015-09-07
| | | | | | | | Untested.
* | Revert "configure: colorize warning messages"Michael Niedermayer2015-09-08
| | | | | | | | | | | | This broke win32, MSYS This reverts commit 3e830b6dc844219673b6a036d8a3bd326ac4f9e2.
* | avcodec: loongson delete invalid simple idct put and add optimization周晓勇2015-09-08
| | | | | | | | | | | | | | | | | | Change-Id: I23a36c65915f01a1cf20e317c14b8eaaa62958b4 Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn> Fixes Decoding of http://loongnix.org/ftp/multimedia/testing/nanocore_720p_24fps_mpeg4_ac3_short.avi Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Add NOA creditsMichael Niedermayer2015-09-08
| |
* | avcodec: loongson optimize h264dsp idct and loop filter with mmi周晓勇2015-09-07
| | | | | | | | | | | | Change-Id: Ic87fb8f5cd22a502ff9dbbc5a5a8ea97cfc8a1dd Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/vf_thumbnail: use the name 's' for the pointer to the private contextGanesh Ajjanagadde2015-09-07
| | | | | | | | Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | libavcodec/qsvdec.c: correct flush() handler has been implementedIvan Uskov2015-09-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/qsvdec.c: correct handling of dynamic frame size changing has ↵Ivan Uskov2015-09-07
| | | | | | | | | | | | been implemented Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: remove VIMA Makefile entryJames Almer2015-09-07
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec: remove missing bits from deprecated VIMA decoderJames Almer2015-09-07
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/http: exponentially delay reconnection to avoid flooding the serverMichael Niedermayer2015-09-07
| | | | | | | | | | Reviewed-by: Zhang Rui <bbcallen@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/http: Add reconnect_at_eof and reconnect_streamed optionsMichael Niedermayer2015-09-07
| | | | | | | | | | | | | | They allow reconnecting endless live streams which fail with eof Reviewed-by: Zhang Rui <bbcallen@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec: remove fourcc values from AVCodecIDsJames Almer2015-09-07
| | | | | | | | | | | | | | | | Based on a patch by wm4. Reviewed-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec: remove duplicate AVCodecIDsJames Almer2015-09-07
| | | | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | configure: colorize warning messagesGanesh Ajjanagadde2015-09-07
| | | | | | | | | | | | | | | | | | This patch introduces color warning messages (yellow). They are enabled whenever available. Tested with zsh, bash, and sh (bash under --posix). Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '9ad1e0c12caa440de860bd8f2122beb11d73815c'Hendrik Leppkes2015-09-07
|\| | | | | | | | | | | | | * commit '9ad1e0c12caa440de860bd8f2122beb11d73815c': mux: Make sure that the data is actually written Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mux: Make sure that the data is actually writtenSean McGovern2015-09-03
| | | | | | | | | | | | | | | | | | | | And forward the error if it is not. Bug-Id: 881 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e05f7ed5436207f4a55f1978b223c7f8bc82af42'Hendrik Leppkes2015-09-07
|\| | | | | | | | | | | | | * commit 'e05f7ed5436207f4a55f1978b223c7f8bc82af42': file: properly forward errors from file_read() and file_write() Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * file: properly forward errors from file_read() and file_write()Sean McGovern2015-09-03
| | | | | | | | | | | | | | | | Bug-Id: 881 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>