summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avfilter/vf_colormatrix: make sure the number of threads is even for yuv420pClément Bœsch2015-03-17
| | | | | Fix crash with for example: ffmpeg -f lavfi -i testsrc=568x320 -threads 3 -vf format=yuv420p,colormatrix=bt709:smpte170m -f null -
* Merge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c'Michael Niedermayer2015-03-17
|\ | | | | | | | | | | | | * commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c': isom: Add support for TSCC2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * isom: Add support for TSCC2Luca Barbato2015-03-17
| | | | | | | | As produced by Camtasia 4.
* | Merge commit '91894f27dce531c13d7e1be20253877f2e1e9e66'Michael Niedermayer2015-03-17
|\| | | | | | | | | | | | | | | | | | | | | * commit '91894f27dce531c13d7e1be20253877f2e1e9e66': configure: Disable shift operator precedence warnings with MSVC Conflicts: configure See: 9e208ce6dd94596b4185a93af4aab3dcd28eb5b7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Disable shift operator precedence warnings with MSVCDiego Biurrun2015-03-17
| |
* | avformat/mov: fix mis-detection of jpeg2000Michael Niedermayer2015-03-17
| | | | | | | | | | | | Fixes demuxer choice for Ticket 2792 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_histeq: Change enums to int, which are accessed via AVOption as intMichael Niedermayer2015-03-17
| | | | | | | | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_fieldmatch: Change enums to int, which are accessed via AVOption ↵Michael Niedermayer2015-03-17
| | | | | | | | | | | | | | | | as int This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_field: Change enum to int, which is accessed via AVOption as intMichael Niedermayer2015-03-17
| | | | | | | | | | | | This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfenc: fix memleaks in mxf_write_footerAndreas Cadhalpun2015-03-17
| | | | | | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/protocols: Fixed missing example section markerTobias Rapp2015-03-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vc1_pred: Fix undefined shiftsMichael Niedermayer2015-03-17
| | | | | | | | | | | | Found-by: Clang -fsanitize=shift Reported-by: Thierry Foucu <tfoucu@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libx264: use AVERROR_EXTERNAL instead of AVERROR_UNKNOWNClément Bœsch2015-03-17
| |
* | avfilter: handle error in query_formats() of a bunch of random video filtersClément Bœsch2015-03-16
| |
* | avfilter/formats: proper error handling in ff_set_common_*() functionsClément Bœsch2015-03-16
| |
* | avfilter/formats: proper error handling in ff_channel_layouts_ref() and ↵Clément Bœsch2015-03-16
| | | | | | | | | | | | ff_formats_ref() Also make sure the allocation and its check are properly done.
* | avfilter/formats: use av_realloc_array in ADD_FORMAT()Clément Bœsch2015-03-16
| |
* | avfilter/formats: remove unused COPY_INT_LIST() macroClément Bœsch2015-03-16
| | | | | | | | This macro is unused since 247fa6c27c4589d0f7a427c520d782edbb6de060.
* | Merge commit '2cb9c2fc59c9267ad2631c07c81c188058502259'Michael Niedermayer2015-03-16
|\| | | | | | | | | | | | | | | | | | | | | * commit '2cb9c2fc59c9267ad2631c07c81c188058502259': movenc: Allow interleaving samples when writing fragmented files Conflicts: libavformat/movenc.c libavformat/movenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Allow interleaving samples when writing fragmented filesMartin Storsjö2015-03-16
| | | | | | | | | | | | | | | | | | | | | | This is incompatible with the omit_tfhd_offset flag (writing position independent fragments with interleaving requires the default_base_moof flag). This makes the moof atoms slightly bigger, but can be better for playback (improving locality of sample data in the mdat). Signed-off-by: Martin Storsjö <martin@martin.st>
* | OpenCL uninit bug fix - clear is_compiled flagsrikanth2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: Fix potential pointer overflow in sdp_probe()Michael Niedermayer2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Fix potential pointer overflowsMichael Niedermayer2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Silence EMMS warnings in ICCMichael Niedermayer2015-03-16
| | | | | | | | | | | | | | | | | | Real world MMX code does not put EMMS at the start and end of every function, it would be incredibly inefficient to do that thus do not warn about that Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '50ff0c05b691524d1fd044a2f2eefb706932fc98'Michael Niedermayer2015-03-16
|\| | | | | | | | | | | | | * commit '50ff0c05b691524d1fd044a2f2eefb706932fc98': movenc: Support writing multiple trun atoms Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Support writing multiple trun atomsMartin Storsjö2015-03-16
| | | | | | | | | | | | | | | | | | This is needed if all the data for one track isn't continuous within the mdat. Normally we make sure all the data for one track is continuous, but in new cases we will need to have the samples interleaved. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'Michael Niedermayer2015-03-16
|\| | | | | | | | | | | | | | | | | | | * commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce': configure: move cross_compile checks after the toolchain section Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: move cross_compile checks after the toolchain sectionJanne Grunau2015-03-16
| |
* | Merge commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea'Michael Niedermayer2015-03-16
|\| | | | | | | | | | | | | * commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea': configure: handle Apple's armv7s in probe_arm_arch() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: handle Apple's armv7s in probe_arm_arch()Janne Grunau2015-03-16
| |
* | Merge commit 'f01c77157789b8e3a59ed2c9646faf8299e41641'Michael Niedermayer2015-03-16
|\| | | | | | | | | | | | | * commit 'f01c77157789b8e3a59ed2c9646faf8299e41641': fate: add explicit support for the toolchain configure option Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: add explicit support for the toolchain configure optionJanne Grunau2015-03-16
| |
* | Merge commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d'Michael Niedermayer2015-03-16
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d': doc: fate: remove outdated SSH key fingerprint Conflicts: doc/fate.texi Not merged, this does not apply to our servers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: fate: remove outdated SSH key fingerprintJanne Grunau2015-03-16
| |
* | hevc: avoid unnecessary calls to get_formatRainer Hochecker2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/cavsvideodec: use avpriv_find_start_code in cavsvideo_probe()zhaoxiu.zeng2015-03-16
| | | | | | | | | | Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/cavsdsp: remove incorrect LOCAL_ALIGN tmpMichael Niedermayer2015-03-16
| | | | | | | | | | | | This is faster and simpler as well Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc: Fix undefined shiftsMichael Niedermayer2015-03-16
| | | | | | | | | | | | Found-by: Clang -fsanitize=shift Reported-by: Thierry Foucu <tfoucu@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tdsc: Remove ;;Michael Niedermayer2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: refactor repeated HLS option updatesMicah Galizia2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57'Michael Niedermayer2015-03-16
|\| | | | | | | | | | | | | | | * commit '66a0ac0a802dd794acc1ab8559d3db9e98755b57': mkv: Add support for DVB subtitles See: 4789c25d83c4a90e8ef81d2cc05be6d2f12dfa68 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mkv: Add support for DVB subtitlesLuca Barbato2015-03-15
| | | | | | | | Bug-Id: 833
* | lavfi/sendcmd: improve error reporting and robustness in case of missing ↵Stefano Sabatini2015-03-16
| | | | | | | | | | | | commands In particular, fix crash with -vf sendcmd, when no arguments are provided.
* | x86/proresdsp: remove ff_prores_idct_put_10_sse4James Almer2015-03-16
| | | | | | | | | | | | | | It's exactly the same as the sse2 version. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | x86/proresdsp: remove unused macroJames Almer2015-03-16
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/mov: Disallow ".." in dref unless use_absolute_path is setMichael Niedermayer2015-03-16
| | | | | | | | | | | | | | | | as this kind of allows to circumvent it to some extend. We also could add a separate parameter or value to choose this Found-by: ramiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec: fix MXFPackage->comment_refs memory leakMark Reid2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: store cookies returned in HLS key responseMicah Galizia2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: if XLL is enabled use xll channelsMichael Niedermayer2015-03-16
| | | | | | | | | | | | Fixes outputting 14 channels instead of 7 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: Only upsample as much data as is thereMichael Niedermayer2015-03-16
| | | | | | | | | | Found-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>