summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8'Michael Niedermayer2014-04-23
|\ | | | | | | | | | | | | | | * commit 'b0bdc2a7123abd0287de435726ab68e9e475a8d8': avutil: move av_get_time_base_q() after include rational.h See: c7251fec39c5b54470bb295acfc81d89683843c7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: move av_get_time_base_q() after include rational.hMichael Niedermayer2014-04-22
| | | | | | | | | | | | | | Fix compilation Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '502512ea0f179165782777265f441d4061ff6012'Michael Niedermayer2014-04-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '502512ea0f179165782777265f441d4061ff6012': avutil: Add av_get_time_base_q() Conflicts: doc/APIchanges libavutil/utils.c libavutil/version.h See: dac7e8a94e49e41f1dd0af34dc17d124d5b156ba Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: Add av_get_time_base_q()Derek Buitenhuis2014-04-22
| | | | | | | | | | | | | | | | This fixes usage of AV_TIME_BASE_Q in C++ applications, which cannot use compound literals directly in their code. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '9155c595f1a9c5a089a59e2c0aefdfabd0a6c59b'Michael Niedermayer2014-04-23
|\| | | | | | | | | | | | | | | | | * commit '9155c595f1a9c5a089a59e2c0aefdfabd0a6c59b': fic: Support rendering cursors Not merged as the commit is missing changes that where replied to with "done" on ffmpeg-devel Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fic: Support rendering cursorsDerek Buitenhuis2014-04-22
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '40b331e1f41cf118bd1b0807cac801437255636f'Michael Niedermayer2014-04-22
|\| | | | | | | | | | | | | | | * commit '40b331e1f41cf118bd1b0807cac801437255636f': fic: Use proper quantization matrix index See: 6d149d28183a59a28143431f8e629484a52948b2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fic: Use proper quantization matrix indexDerek Buitenhuis2014-04-22
| | | | | | | | | | | | | | | | The matrices are not zigzagged. Fixes artefacting. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '3956a5e0ea46ed7e27ca888fe11c47986ad99261'Michael Niedermayer2014-04-22
|\| | | | | | | | | | | | | * commit '3956a5e0ea46ed7e27ca888fe11c47986ad99261': aarch64: NEON vorbis_inverse_coupling Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: NEON vorbis_inverse_couplingJanne Grunau2014-04-22
| | | | | | | | | | From the ARMv7 NEON version. 16 times faster as the C version, overall more than 12% faster vorbis decoding on Apple's A7.
* | Merge commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4'Michael Niedermayer2014-04-22
|\| | | | | | | | | | | | | * commit '8f9fe6ae3461ce270bce6b7083fda5ec314cdad4': aarch64: NEON fixed/floating point MPADSP apply_window Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: NEON fixed/floating point MPADSP apply_windowJanne Grunau2014-04-22
| | | | | | | | | | 30%/25% (fixed/float) faster mp3 decoding on Apple's A7. The floating point decoder is approximately 7% faster.
* | Merge commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924'Michael Niedermayer2014-04-22
|\| | | | | | | | | | | | | * commit 'f4d5a2cc35fcdf06ec031fabe8b0710e995fe924': aarch64: NEON float to s16 audio conversion Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: NEON float to s16 audio conversionJanne Grunau2014-04-22
| |
* | Merge commit 'ee2bc5974fe64fd214f52574400ae01c85f4b855'Michael Niedermayer2014-04-22
|\| | | | | | | | | | | | | * commit 'ee2bc5974fe64fd214f52574400ae01c85f4b855': aarch64: NEON float (i)MDCT Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: NEON float (i)MDCTJanne Grunau2014-04-22
| | | | | | | | Approximately as fast as the ARM NEON version on Apple's A7.
* | Merge commit '650c4300d94aa9398ff1dd4f454bf39eaa285f62'Michael Niedermayer2014-04-22
|\| | | | | | | | | | | | | * commit '650c4300d94aa9398ff1dd4f454bf39eaa285f62': aarch64: NEON float FFT Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aarch64: NEON float FFTJanne Grunau2014-04-22
| | | | | | | | Approximately as fast as the ARM NEON version on Apple's A7.
* | avutil: move av_get_time_base_q() after include rational.hMichael Niedermayer2014-04-22
| | | | | | | | | | | | Fix compilation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: Add av_get_time_base_q()Derek Buitenhuis2014-04-22
| | | | | | | | | | | | | | | | This fixes usage of AV_TIME_BASE_Q in C++ applications, which cannot use compound literals directly in their code. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | fic: Use proper quantization matrix indexDerek Buitenhuis2014-04-22
| | | | | | | | | | | | | | | | The matrices are not zigzagged. Fixes artefacting. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Add "const" to avoid compiler warning.Reimar Döffinger2014-04-22
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add missing ';'.Reimar Döffinger2014-04-22
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Various small spelling fixes.Reimar Döffinger2014-04-22
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avcodec/dvbsubdec: use av_mallocz_array()Michael Niedermayer2014-04-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cook: use av_malloc_array()Michael Niedermayer2014-04-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dsddec: use av_malloc_array()Michael Niedermayer2014-04-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: make the pes packet length omission optionalMichael Niedermayer2014-04-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: Changed Video PES packet length to 0.Graham Booker2014-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rational for this is another issue that plex has exposed. When it is conducting a transcode of video to HLS for streaming, my father noticed artifacts when played on his GoogleTV (NSZ-GT1). He sent me a test file and I reproduced it on my device of the same model. It is important to note that the artifacts were not present when streaming to VLC or QuickTime Player. I copied the command-line that plex used, and conducted all of the following tests using FFmpeg git. Transcode to HLS: artifacts on playback Transcode to TS: playback is fine Cat HLS segments into a single TS: playback is fine Segment single TS file to segments: artifacts on playback Segment single TS file to segments using Apple's HLS segmenter: playback is fine At this point I carefully examined the differences between Apple's HLS segmenter output and FFmpeg's. Among the considerable differences, I noticed that the video PES packets always had a 0 length. So I continued: Transcode to HLS using FFmpeg with 0 length PES packets: playback is fine. Segment single TS to segments with 0 length PES packets: playback is fine. All failures mentioned are only on the GTV since it is the only player on which I could reproduce artifacts. I only tested the GTV, VLC, and QuickTime Player though, so my test case is limited. I do not know if other players exhibit this issue. Since it was useful last time, I have uploaded the test file as hls_pes_packet_length.m4v along with its associated txt file which contains the transcode command-line that was used. Reviewed-by: Kieran Kunhya <kierank@obe.tv> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dsp: fix build without inline asmHendrik Leppkes2014-04-22
| | | | | | | | | | Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31'Michael Niedermayer2014-04-22
|\| | | | | | | | | | | | | * commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31': lavf: do not use the parser duration for video Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: do not use the parser duration for videoAnton Khirnov2014-04-22
| | | | | | | | | | The parser has no way of knowing video duration, and therefore no video parsers set it.
* | Merge commit '1ae8198bca749a0cff205196cc83d35b9962849b'Michael Niedermayer2014-04-22
|\| | | | | | | | | | | | | | | | | | | * commit '1ae8198bca749a0cff205196cc83d35b9962849b': avconv: always reset packet pts after decoding an audio frame Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: always reset packet pts after decoding an audio frameAnton Khirnov2014-04-22
| | | | | | | | | | Currently, if a decoder sets AVFrame.pts, we'd send the same timestamp to it twice, which is wrong.
* | Merge commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9'Michael Niedermayer2014-04-22
|\| | | | | | | | | | | | | * commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9': lavc: improve AVCodecContext.delay doxy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: improve AVCodecContext.delay doxyAnton Khirnov2014-04-22
| |
* | Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091'Michael Niedermayer2014-04-22
|\| | | | | | | | | | | | | * commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091': txd: do not set the codec timebase. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * txd: do not set the codec timebase.Anton Khirnov2014-04-22
| | | | | | | | | | It is not supposed to be changed from outside of lavc. Set the stream timebase and average framerate instead.
* | avformat/avidec: Speed up keyframe detection codeMichael Niedermayer2014-04-22
| | | | | | | | | | | | Fixes Ticket3531 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | MAINTAINERS: Add myself as FIC maintainerDerek Buitenhuis2014-04-21
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avcodec/wma: use av_malloc_array()Michael Niedermayer2014-04-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/pthread: Use av_mallocz_array()Michael Niedermayer2014-04-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libxavs: Use av_mallocz_array()Michael Niedermayer2014-04-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cngenc: Use av_malloc_array()Michael Niedermayer2014-04-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/snow: use FF_ALLOC(Z)_ARRAY_OR_GOTOMichael Niedermayer2014-04-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/internal: add FF_ALLOC_ARRAY_OR_GOTO & FF_ALLOCZ_ARRAY_OR_GOTOMichael Niedermayer2014-04-22
| | | | | | | | | | | | These are similar to the existing FF_ALLOCZ_OR_GOTO & FF_ALLOC_OR_GOTO Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8'Michael Niedermayer2014-04-21
|\| | | | | | | | | | | | | | | * commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8': mpegvideo: Use the current_picture pts See: c354576457c8ae0906d6f4f20c80816f3e3bb55d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Use the current_picture ptsMichael Niedermayer2014-04-21
| | | | | | | | | | | | | | | | | | The picture slot can be recycled by select_input_picture and only current_picture is populated with the valid pts. Unbreak timestamps when in cbr mode. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '6f243b17c537646b894857d43dfdac65f85ab377'Michael Niedermayer2014-04-21
|\| | | | | | | | | | | | | | | * commit '6f243b17c537646b894857d43dfdac65f85ab377': avcodec/fic: Fix return value check See: 230db1426d127a25c03b457fec25900653de2721 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec/fic: Fix return value checkMichael Niedermayer2014-04-21
| | | | | | | | | | | | | | | | Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>