summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* doc: document the addition of the AVProbeData.mime_type field and it's ↵Andreas Cadhalpun2014-09-13
| | | | | | | implications Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* configure: Fix miscompilation for i586Mikulas Patocka2014-09-12
| | | | | | | If the CPU is 386, 486 or pentium, we must not use cmov in inline assembler. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/img2dec: Fail probing when no data is yet available and the ↵Michael Niedermayer2014-09-12
| | | | | | | | | | | filename contains no number/glob patterns either. Fixes Ticket3901 the seek test error codes change due to a change in the failure path, this could be avoided by changing the respective error codes to EINVAL Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/format: Run image2 probe again when file content data is availableMichael Niedermayer2014-09-12
| | | | | Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/img2dec: reduce bmppipe probe scoreMichael Niedermayer2014-09-12
| | | | | | | | | bmp pipe needs the bmp parser which is not bug free and should thus not be favored over the bmp image2 demuxer that also means this change could be reverted in case bmp pipe is improved so it handles all single bmp images correctly Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* docs: add example around the suggested commit message formatJames Darnley2014-09-12
| | | | | | | It gets rendered inline in HTML and becomes not very clear. Reviewed-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* configure: fix check_cmd in check_host_cppJörg Krause2014-09-11
| | | | | | | | Use correct cpp and c flags variables for the host libc. Signed-off-by: Jörg Krause <jkrause@posteo.de> Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/ppc/float_dsp_altivec: ppc: Fix bug in ff_vector_fmul_add_altivec() ↵Rong Yan2014-09-11
| | | | | | affecting little endian environments on POWER8 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/png_parser: Return the buffered data at the endMichael Niedermayer2014-09-11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/pngdec: print the actual number of bytes left in the error caseMichael Niedermayer2014-09-11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/img2_alias_pix: Add AVClass and image2 AVOptionsMichael Niedermayer2014-09-11
| | | | | | This fixes the default timebase and allows overriding the framerate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/img2_alias & brender_pix: fix function namesMichael Niedermayer2014-09-11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/img2_brender_pix: Add AVClass and image2 AVOptionsMichael Niedermayer2014-09-11
| | | | | | This fixes the default timebase and allows overriding the framerate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/img2: Make AVOptions available to img* demuxers defined in other filesMichael Niedermayer2014-09-11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/rmdec: very basic MLTI supportMichael Niedermayer2014-09-11
| | | | | | Fixes Ticket2152 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph ↵Michael Niedermayer2014-09-11
| | | | | | | | not just when changing audio resample parameters Fixes Ticket3562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'Michael Niedermayer2014-09-11
|\ | | | | | | | | | | | | | | | | | | * commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04': doc: Fix syntax and logical errors in avconv stream combination example Conflicts: doc/ffmpeg.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Fix syntax and logical errors in avconv stream combination exampleDiego Biurrun2014-09-10
| | | | | | | | | | Bug-Id: 661 CC: libav-stable@libav.org
* | avcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()Michael Niedermayer2014-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dnxhdenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()Michael Niedermayer2014-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Use FF_ALLOCZ_ARRAY_OR_GOTO()Michael Niedermayer2014-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO()Michael Niedermayer2014-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aacenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()Michael Niedermayer2014-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ac3enc_template: Use FF_ALLOC_ARRAY_OR_GOTO()Michael Niedermayer2014-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()Michael Niedermayer2014-09-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/concatdec: fix "warning: explicitly assigning a variable of type ↵Michael Niedermayer2014-09-10
| | | | | | | | | | | | | | int to itself" Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3dec: Improve seeking frame sync codeMichael Niedermayer2014-09-10
| | | | | | | | | | | | Fixes Ticket3884 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_filter/x86/idet: use HADDD where appropriatePascal Massimino2014-09-09
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove FF_API_ASS_SSA dead codeClément Bœsch2014-09-09
| |
* | avcodec/snow: make new_picture constMichael Niedermayer2014-09-09
| | | | | | | | | | | | Fixes "assignment discards const qualifier from pointer target type" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'Michael Niedermayer2014-09-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47': dv: K&R formatting cosmetics Conflicts: libavcodec/dv.c libavcodec/dv.h libavcodec/dv_profile.c libavcodec/dvdec.c libavcodec/dvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: K&R formatting cosmeticsGabriel Dume2014-09-09
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23'Michael Niedermayer2014-09-09
|\| | | | | | | | | | | | | | | * commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23': x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags See: 428aa14a4851711ea1aa3f9b2d5bac867434993f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflagsHenrik Gramner2014-09-09
| | | | | | | | | | | | Previously there was a limit of two cpuflags. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'Michael Niedermayer2014-09-09
|\| | | | | | | | | | | | | | | * commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f': x86inc: Free up variable name "n" in global namespace See: a4dbabc8b3c123c071c925d2d749a50e4895ebcd Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Free up variable name "n" in global namespaceLoren Merritt2014-09-09
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '176a0fca3fd64f91d585f96137388e00d8c101b6'Michael Niedermayer2014-09-09
|\| | | | | | | | | | | | | | | * commit '176a0fca3fd64f91d585f96137388e00d8c101b6': x86inc: Make ym# behave the same way as xm# See: 720c21d11ff0742989bae3e763fc0a85a587fdb6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Make ym# behave the same way as xm#Henrik Gramner2014-09-09
| | | | | | | | | | | | This makes more sense for future implementations of templates with zmm registers. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | av_filter/x86/idet: MMX/SSE2 implementation of 16bits filter_line()Pascal Massimino2014-09-09
| | | | | | | | | | | | | | | | tested on http://ps-auxw.de/10bit-h264-sample/10bit-eldorado.mkv MMX: ~30% faster decoding overall SSE2:~40% faster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/rawenc: drop sizeof(AVFrame) dependencyMichael Niedermayer2014-09-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9752d07d33d5370f7819865fbb5e582b982aad06'Michael Niedermayer2014-09-09
|\| | | | | | | | | | | | | | | | | | | | | * commit '9752d07d33d5370f7819865fbb5e582b982aad06': dirac: K&R formatting cosmetics Conflicts: libavcodec/dirac.c libavcodec/dirac_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dirac: K&R formatting cosmeticsGabriel Dume2014-09-09
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avformat/mpeg: update comment on probe scoreMichael Niedermayer2014-09-09
| | | | | | | | | | Found-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/x11grab: fix cursor drawing in multi-screen setupAntonio Ospite2014-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code uses XFixes to retrieve the cursor coordinates, but XFixes gives no information of what screen the pointer is on; this results in always drawing the cursor on the captured screen even if the mouse pointer was on another screen. For example, when capturing from screen 1 (i.e. -f x11grab -i ":0.1") the cursor was being drawn in the captured image even when the mouse pointer was actually on screen 0, which is wrong and visually confusing. Use XQueryPointer to check that the pointer is actually on the screen which is being captured. Signed-off-by: Antonio Ospite <ao2@ao2.it> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/x11grab: rename the "w" Window to "root" in paint_mouse_pointerAntonio Ospite2014-09-09
| | | | | | | | | | | | | | | | | | This specifies better the meaning of the variable, and is also in preparation of a subsequent change which will introduce a temporary Window variable for which "w" is an good name. Signed-off-by: Antonio Ospite <ao2@ao2.it> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_cropdetect: Do not check lines or columns twice on black framesMichael Niedermayer2014-09-09
| | | | | | | | | | Idea from patch by: hjiodjf 97xgw46 <jfbvxt@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpeg: increase score for short mpeg-ps by 1Michael Niedermayer2014-09-09
| | | | | | | | | | | | Fixes Ticket 3855 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'Michael Niedermayer2014-09-08
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1ec335513f95bf2441f81d761ea127325ecd81a0': time: Add missing zero Conflicts: libavutil/time.c See: ebef9f5a56d7df91e010a177a80cfc8dbe394305 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * time: Add missing zeroGabriel Dume2014-09-08
| | | | | | | | | | | | Leftover of 56d7df91e010a177a80cfc8dbe394305 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avcodec/mpeg4videodec: fix 'libavcodec/mpeg4videodec.c:2762:22: warning: ↵Michael Niedermayer2014-09-08
| | | | | | | | | | | | unused variable mpeg4_vdpau_class [-Wunused-const-variable]' Signed-off-by: Michael Niedermayer <michaelni@gmx.at>