summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d'Michael Niedermayer2014-10-10
|\ | | | | | | | | | | | | | | | | | | | | * commit '09e1ccc8cddc946da5e10841f10dc5ebdd187d9d': sctp: Use AVERROR_BUG instead of abort() Conflicts: libavformat/sctp.c See: 2e59142fa9a0db5fab8aa2e676ba524f61280b83 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sctp: Use AVERROR_BUG instead of abort()Luca Barbato2014-10-10
| | | | | | | | | | | | | | | | Trying to write to a stream id larger the the maximum requested is a programming error, still there is no reason to leave a reachable abort() in the codebase. CC: libav-stable@libav.org
* | Merge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'eb4f9069002e73648f6640cd054fc814cfda75b8': lavf: More informative error message Conflicts: libavformat/mux.c See: 30ced7e69f434bd49b39fb7c8ce02d9ba71babfc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: More informative error messageLuca Barbato2014-10-10
| | | | | | | | Print the timestamp values and not just the stream index.
* | utvideoenc: properly set slice height/last lineChristophe Gisquet2014-10-10
| | | | | | | | | | | | | | | | | | Mimic decoder and obey sampling. Does not affect fate tests for utvideo. Fixes ticket #3949. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/softfloat: Fix undefined shift in av_add_sf()Michael Niedermayer2014-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: add EAC3 muxing support.Benoit Fouet2014-10-10
| | | | | | | | | | | | | | | | | | Support only one independent substream right now, and only syncframes containing 6 blocks. Fixes part of ticket #3074 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | float_dsp-test: allow forcing cpuflagsJames Almer2014-10-10
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/atrac3: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cavs: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() for POWER LERong Yan2014-10-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/ppc/me_cmp.c : fix sad16_altivec() sse16_altivec() ↵Rong Yan2014-10-10
| | | | | | | | | | | | sad16_xy2_altivec() sad16_x2_altivec() sad16_y2_altivec() sad8_altivec() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp9: enable multi-thread decoding when refreshctx is equal to 0Di Wu2014-10-10
| | | | | | | | | | | | | | | | | | | | | | In vp9_decode_frame function, ff_thread_finish_setup is not called when refreshctx is equal to 0, and the next decoding thread can not start work until the cunrrent frame has been decoded completely. So ff_thread_finish_setup needs to be called to enable Multi-thread decoding in this condition. Signed-off-by: Di Wu <di1028.wu@samsung.com> Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | libavcodec/ppc/mpegvideoencdsp.c : fix pix_norm1_altivec() and ↵Rong Yan2014-10-10
| | | | | | | | | | | | pix_sum_altivec() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/ppc/pixblockdsp.c : fix get_pixels_altivec() and ↵Rong Yan2014-10-10
| | | | | | | | | | | | diff_pixels_altivec() for POWER LE Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b7c3bfd5eb3153f7de8039f96e7911b2a1d46cae': w32pthreads: use the condition variable API directly when targeting newer versions of Windows Conflicts: compat/w32pthreads.h See: 8c6992bf0cc24542a5ae245cd037a23638b76d75 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * w32pthreads: use the condition variable API directly when targeting newer ↵James Almer2014-10-10
| | | | | | | | | | | | | | | | | | | | versions of Windows Wrap the function calls in a similar fashion to how it's being done with the critical section API. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11'Michael Niedermayer2014-10-10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11': w32pthreads: use the CONDITION_VARIABLE typedef if available Conflicts: compat/w32pthreads.h configure See: 0c0694931442ef9ea91eace120e0629e0ac01b76 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * w32pthreads: use the CONDITION_VARIABLE typedef if availableJames Almer2014-10-10
| | | | | | | | | | | | | | | | This silences warnings about passing arguments from incompatible pointer type when targeting Windows Vista or newer. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Martin Storsjö <martin@martin.st>
* | ffprobe: Simplify by using av_color_range_name()Michael Niedermayer2014-10-10
| | | | | | | | | | Idea from: a2c00d22e71d13b72828147be86aa9e961c6cae6 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/format: move mime_type_opt declaration to where its usedMichael Niedermayer2014-10-10
| | | | | | | | | | | | also remove a related dead store Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/os_support: include unistd.h before defining lseek to lseek64 on ↵Michael Niedermayer2014-10-10
| | | | | | | | | | | | | | | | | | android fixes build failure Found-by: James Almer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/error: Add AVERROR_INPUT_CHANGED & AVERROR_OUTPUT_CHANGED to ↵Michael Niedermayer2014-10-10
| | | | | | | | | | | | error_entries[] Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/webm_dash: Allow filenames without directoriesVignesh Venkatasubramanian2014-10-10
| | | | | | | | | | | | | | | | Fix basename computation code to allow just file names without any directories in the path. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffplay: dont leave swresampler in half initialized stateMarton Balint2014-10-09
| | | | | | | | | | | | | | | | | | | | On init failure, let's just free it, so next time it will be recreated from start. Also fixes Coverity CID 1241515. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
* | compat/w32pthreads: use the condition variable API directly when targeting ↵James Almer2014-10-09
| | | | | | | | | | | | | | | | | | | | newer versions of Windows Wrap the function calls in a similar fashion to how it's being done with the critical section API. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | Fix writing first audio Cues in dash mode.Frank Galligan2014-10-09
| | | | | | | | | | | | | | | | | | In dahsmode Matroska is not writing the first Cluster for every audio stream in the Cues element. Signed-off-by: Frank Galligan <frankgalligan@gmail.com> Reviewed-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | compat/w32pthreads: use the CONDITION_VARIABLE typedef if availableJames Almer2014-10-09
| | | | | | | | | | | | | | | | | | This silences warnings about passing arguments from incompatible pointer type when targeting Windows Vista or newer. Tested-by: Matt Oliver <protogonoi@gmail.com> Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avutil/softfloat: add some assertsMichael Niedermayer2014-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/softfloat: Fix dependence on signed overflow in av_normalize1_sf()Michael Niedermayer2014-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/Makefile: add softfloat to TESTPROGSMichael Niedermayer2014-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: E-AC-3 streams need parsing too.Benoit Fouet2014-10-09
| | | | | | | | | | | | | | syncframes in E-AC-3 can be combined to provide 6 audio blocks per sample, thus requiring parsing for proper decoding. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: fix 2GB file seek limit on AndroidYu Xiaolei2014-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2bc220958c7570020d87ee353db65460b518998a'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | | | | | | | | | * commit '2bc220958c7570020d87ee353db65460b518998a': ismindex: handle discontinuous streams better Conflicts: tools/ismindex.c See: d3834f290138cb8c48fd404081ac5b9a2ca14564 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: handle discontinuous streams betterMika Raento2014-10-09
| | | | | | | | | | | | | | Read the fragment duration from the trun sample data, rather than assuming that there are no gaps. Signed-off-by: Martin Storsjö <martin@martin.st>
* | ismindex: handle discontinuous streams betterMika Raento2014-10-09
| | | | | | | | | | | | | | | | Reads the fragment duration from the trun sample data, rather than assuming that there are no gaps. Creates much better playlists for our inputs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Fix 'warning: format specifies type unsigned short but the ↵Michael Niedermayer2014-10-09
| | | | | | | | | | | | argument has type int' Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Fix "warning: pointer type mismatch in conditional expression"Michael Niedermayer2014-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dump: use format dump_separator if the codec one is not setMichael Niedermayer2014-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Add missing AV_PIX_FMT_YUVJ411P to color_range override code.Michael Niedermayer2014-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix seperator typoMichael Niedermayer2014-10-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | | | * commit '1a02e78653a5c7674e6c43b6e6f2748dbd2091d7': vc1: initialize color properties See: ddabecbbf5509325c6c695ccc60d67c0af2065f3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: initialize color propertiesVittorio Giovara2014-10-08
| |
* | Merge commit 'eddf95283fbba1b469b76e7518bc3941f671b193'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | * commit 'eddf95283fbba1b469b76e7518bc3941f671b193': vp9: initialize color space and range properties Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vp9: initialize color space and range propertiesVittorio Giovara2014-10-08
| |
* | Merge commit '65875a8b3b079752da25a61ec188d2e3d90a569f'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | * commit '65875a8b3b079752da25a61ec188d2e3d90a569f': vp8: initialize color space and range properties Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vp8: initialize color space and range propertiesVittorio Giovara2014-10-08
| |
* | Merge commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | * commit '0d8a3656ba4c0ae8e4e0c91ff6b07d72a317f9f6': mov: support the Color Parameter Atoms 'colr' Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: support the Color Parameter Atoms 'colr'Vittorio Giovara2014-10-08
| |
* | Merge commit '586ea0379c207a942c1f2d61e0b3a63c458cc598'Michael Niedermayer2014-10-09
|\| | | | | | | | | | | | | * commit '586ea0379c207a942c1f2d61e0b3a63c458cc598': avcodec: fix colorspace option description Merged-by: Michael Niedermayer <michaelni@gmx.at>