aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avformat: Use G726LE decoder for Sun AU filesCarl Eugen Hoyos2013-10-181-1/+13
| | | | | | fixes ticket #1955 as suggested by Roman. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec: Add little-endian G726 decoderCarl Eugen Hoyos2013-10-185-3/+33
| | | | | | | Fixes part of Ticket1955 suggested by Roman. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Support 4k AVC-Intra in mov.Carl Eugen Hoyos2013-10-181-0/+1
|
* avformat/flvdec: use avpriv_request_sample()Paul B Mahol2013-10-181-2/+2
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/hevcpred: fix make checkheaders.Clément Bœsch2013-10-171-0/+3
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-171-1/+1
|\ | | | | | | | | | | | | * qatar/master: fate: Increase the tolerance in the lavr tests Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Increase the tolerance in the lavr testsMartin Storsjö2013-10-171-1/+1
| | | | | | | | | | | | | | A few fate instances on OS/2, OpenBSD, FreeBSD and IA64 linux currently still fail a few tests with a maxdiff of 6. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92'Michael Niedermayer2013-10-171-0/+5
|\| | | | | | | | | | | | | * commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92': fate: aac: Add test for AAC-LD Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: aac: Add test for AAC-LDDiego Biurrun2013-10-171-0/+5
| |
* | lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUTStefano Sabatini2013-10-173-7/+7
| | | | | | | | | | Improve interface flexibility. In particular makes it possible to set channel layout through symbolic names using the av_opt_set() interface.
* | lavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functionsStefano Sabatini2013-10-174-3/+83
| | | | | | | | | | The new type is compatible with AV_OPT_TYPE_INT64, but allows to specify channel layouts using the format accepted by av_get_channel_layout().
* | lavu/channel_layout: change av_get_channel_layout() behavior at the next bumpStefano Sabatini2013-10-174-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new syntax is preferred since it allows backward syntax compatibility with libswr when switching to the new option handling code with AV_OPT_TYPE_CHANNEL_LAYOUT. With the new parser the string: 1234 is interpreted as a channel layout mask, rather than as a number of channels, and thus it's compatible with the current way to set a channel layout as an integer (e.g. for the icl and ocl options) making use of integer option values. ff_get_channel_layout() with compat=0 will be used in the AV_OPT_TYPE_CHANNEL handler code. The user is encouraged to switch to the new forward compatible syntax, which requires to put a trailing "c" when specifying a layout as a number of channels.
* | lavu/opt.h: fix grammar typo in av_opt_get* doxyStefano Sabatini2013-10-171-1/+1
| |
* | lavu/opt-test: use automatic set and free handlersStefano Sabatini2013-10-171-3/+2
| | | | | | | | | | In particular, do not set default string value by hand and use av_opt_free() to free context.
* | swscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrastMichael Niedermayer2013-10-171-4/+4
| | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/utils/sws_setColorspaceDetails(): fix indentionMichael Niedermayer2013-10-171-6/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-10-171-4/+4
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Add some necessary casts in the wtv demuxer. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Add some necessary casts in the wtv demuxer.Carl Eugen Hoyos2013-10-171-4/+4
| | | | | | | | | | | | This reverts e8023dba, fixes ticket #3049.
* | | avformat/hevcdec: add more irap cases to hevc_probe()Dirk Farin2013-10-171-2/+6
| | | | | | | | | | | | | | | | | | This fixes fate-hevc-conformance-RAP_A_docomo_4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/hevcdec: cosmetics, whitespacesDirk Farin2013-10-171-24/+26
|/ / | | | | | | | | | | This reduces the difference to the latest hevc demuxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-171-1/+1
|\| | | | | | | | | | | | | * qatar/master: mem: Make av_strdup allocate using av_realloc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mem: Make av_strdup allocate using av_reallocMartin Storsjö2013-10-161-1/+1
| | | | | | | | | | | | | | | | | | This makes sure that pointers from av_strdup are reallocable, which is used in av_dict_set if the AV_DICT_APPEND flag is set. Nothing should rely on pointers from av_strdup being aligned. Signed-off-by: Martin Storsjö <martin@martin.st>
* | hevc: fix pcm with different chroma luma bit widths(cherry picked from ↵Mickaël Raulet2013-10-173-13/+4
| | | | | | | | | | | | commit 6a444516f338424d062c0ef2806714036283603b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: optimize residual coding(cherry picked from commit ↵Mickaël Raulet2013-10-175-270/+226
| | | | | | | | | | | | 70692a44708157b4dfa50e402e446bfa2b27f55e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/log: fix race between setting and using the log callbackMichael Niedermayer2013-10-171-2/+3
| | | | | | | | | | Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/utils: fix docs buildMichael Niedermayer2013-10-161-1/+1
| | | | | | | | | | | | | | | | Not sure this is the correct solution but that can be investigated too once the docs build again Tested-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swsscale/swscale_unscaled: add GBRAP16Paul B Mahol2013-10-161-6/+40
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale/swscale_unscaled: fix alpha pointer & stride for ↵Michael Niedermayer2013-10-161-4/+4
| | | | | | | | | | | | planarRgb16ToRgb16Wrapper() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters: reference ffmpeg-utils manual for color and sizes optionsTimothy Gu2013-10-161-51/+66
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | doc/utils: reformat doc for color syntax and add list of supported colorsTimothy Gu2013-10-161-6/+290
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | doc/utils: rewrite doc for time duration syntaxTimothy Gu2013-10-161-5/+33
| | | | | | | | | | | | | | Extend description and clarify syntax. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Support HEVC in transport streams.Carl Eugen Hoyos2013-10-161-0/+1
| |
* | avcodec/vp9: fix band_counts array size / paddingRonald S. Bultje2013-10-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/exr: piz decompressionPaul B Mahol2013-10-161-0/+467
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-161-66/+80
|\| | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo: Move 8x8 in a separate function Conflicts: libavcodec/mpegvideo_motion.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move 8x8 in a separate functionLuca Barbato2013-10-151-65/+79
| |
* | Merge commit '95587859cc69e5abe37c9e3af48008032d98e262' into HEADMichael Niedermayer2013-10-161-76/+88
|\| | | | | | | | | | | | | | | | | | | * commit '95587859cc69e5abe37c9e3af48008032d98e262': mpegvideo: Move obmc in a separate function Conflicts: libavcodec/mpegvideo_motion.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move obmc in a separate functionLuca Barbato2013-10-151-76/+88
| |
* | Merge commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886'Michael Niedermayer2013-10-160-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886': ffv1: Assume bitdepth 0 means 8bit Conflicts: libavcodec/ffv1dec.c Note, FFmpeg is not affected by this bug Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffv1: Assume bitdepth 0 means 8bitLuca Barbato2013-10-151-0/+1
| | | | | | | | | | CC: libav-stable@libav.org Reported-by: debian/726189
* | Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'Michael Niedermayer2013-10-161-447/+507
|\| | | | | | | | | | | | | | | | | | | * commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860': mpegvideo: K&R formatting cosmetics Conflicts: libavcodec/mpegvideo_motion.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: K&R formatting cosmeticsLuca Barbato2013-10-151-449/+516
| |
* | Merge commit '93f305473f880729d18b5e42067f19d2106cb2e5'Michael Niedermayer2013-10-165-10/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93f305473f880729d18b5e42067f19d2106cb2e5': lavc: Convert some remaining strides to ptrdiff_t Conflicts: libavcodec/h264.h libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/vp56.c libavcodec/wmv2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Convert some remaining strides to ptrdiff_tRonald S. Bultje2013-10-1510-21/+25
| |
* | Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'Michael Niedermayer2013-10-163-45/+154
|\| | | | | | | | | | | | | | | | | | | * commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208': h264_parser: Fix POC parsing for the case where MMCO_RESET is present. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_parser: Fix POC parsing for the case where MMCO_RESET is present.Yusuke Nakamura2013-10-153-47/+154
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'Michael Niedermayer2013-10-161-2/+12
|\| | | | | | | | | | | | | * commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9': h264_parser: Fix POC parsing for the case where MMCO_RESET is absent. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.Yusuke Nakamura2013-10-151-2/+12
| | | | | | | | | | | | | | The prev_ values were not set after parsing POC. Increase length of the buffer decoded to parse enough safely. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '6b081eff4dfc3c899960f69f30cb567266b7dca3'Michael Niedermayer2013-10-161-4/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit '6b081eff4dfc3c899960f69f30cb567266b7dca3': fate: add vorbiscomment cover art test Conflicts: tests/fate/cover-art.mak See: 1ca3902726fb8c1398ab00d146ebe3e2f31b76e6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: add vorbiscomment cover art testJames Almer2013-10-151-0/+4
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>