summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'Michael Niedermayer2014-09-111-3/+3
|\ | | | | | | | | | | | | | | | | | | * commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04': doc: Fix syntax and logical errors in avconv stream combination example Conflicts: doc/ffmpeg.texi Merged-by: Michael Niedermayer <[email protected]>
| * doc: Fix syntax and logical errors in avconv stream combination exampleDiego Biurrun2014-09-101-3/+3
| | | | | | | | | | Bug-Id: 661 CC: [email protected]
* | avcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()Michael Niedermayer2014-09-101-10/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/dnxhdenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()Michael Niedermayer2014-09-101-15/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mpegvideo: Use FF_ALLOCZ_ARRAY_OR_GOTO()Michael Niedermayer2014-09-101-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO()Michael Niedermayer2014-09-101-10/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/aacenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()Michael Niedermayer2014-09-101-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/ac3enc_template: Use FF_ALLOC_ARRAY_OR_GOTO()Michael Niedermayer2014-09-101-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()Michael Niedermayer2014-09-101-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/concatdec: fix "warning: explicitly assigning a variable of type ↵Michael Niedermayer2014-09-101-4/+4
| | | | | | | | | | | | | | int to itself" Reviewed-by: Nicolas George <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mp3dec: Improve seeking frame sync codeMichael Niedermayer2014-09-101-8/+19
| | | | | | | | | | | | Fixes Ticket3884 Signed-off-by: Michael Niedermayer <[email protected]>
* | av_filter/x86/idet: use HADDD where appropriatePascal Massimino2014-09-091-16/+3
| | | | | | | | Signed-off-by: James Almer <[email protected]>
* | avformat: remove FF_API_ASS_SSA dead codeClément Bœsch2014-09-094-168/+0
| |
* | avcodec/snow: make new_picture constMichael Niedermayer2014-09-091-1/+1
| | | | | | | | | | | | Fixes "assignment discards const qualifier from pointer target type" Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'Michael Niedermayer2014-09-098-992/+1032
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <[email protected]>
| * dv: K&R formatting cosmeticsGabriel Dume2014-09-097-989/+1029
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23'Michael Niedermayer2014-09-090-0/+0
|\| | | | | | | | | | | | | | | * commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23': x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags See: 428aa14a4851711ea1aa3f9b2d5bac867434993f Merged-by: Michael Niedermayer <[email protected]>
| * x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflagsHenrik Gramner2014-09-091-19/+22
| | | | | | | | | | | | Previously there was a limit of two cpuflags. Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'Michael Niedermayer2014-09-090-0/+0
|\| | | | | | | | | | | | | | | * commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f': x86inc: Free up variable name "n" in global namespace See: a4dbabc8b3c123c071c925d2d749a50e4895ebcd Merged-by: Michael Niedermayer <[email protected]>
| * x86inc: Free up variable name "n" in global namespaceLoren Merritt2014-09-091-9/+9
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit '176a0fca3fd64f91d585f96137388e00d8c101b6'Michael Niedermayer2014-09-090-0/+0
|\| | | | | | | | | | | | | | | * commit '176a0fca3fd64f91d585f96137388e00d8c101b6': x86inc: Make ym# behave the same way as xm# See: 720c21d11ff0742989bae3e763fc0a85a587fdb6 Merged-by: Michael Niedermayer <[email protected]>
| * x86inc: Make ym# behave the same way as xm#Henrik Gramner2014-09-091-4/+4
| | | | | | | | | | | | This makes more sense for future implementations of templates with zmm registers. Signed-off-by: Diego Biurrun <[email protected]>
* | av_filter/x86/idet: MMX/SSE2 implementation of 16bits filter_line()Pascal Massimino2014-09-094-14/+103
| | | | | | | | | | | | | | | | 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 <[email protected]>
* | avcodec/rawenc: drop sizeof(AVFrame) dependencyMichael Niedermayer2014-09-091-3/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '9752d07d33d5370f7819865fbb5e582b982aad06'Michael Niedermayer2014-09-092-81/+83
|\| | | | | | | | | | | | | | | | | | | | | * commit '9752d07d33d5370f7819865fbb5e582b982aad06': dirac: K&R formatting cosmetics Conflicts: libavcodec/dirac.c libavcodec/dirac_parser.c Merged-by: Michael Niedermayer <[email protected]>
| * dirac: K&R formatting cosmeticsGabriel Dume2014-09-092-83/+83
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | avformat/mpeg: update comment on probe scoreMichael Niedermayer2014-09-091-1/+1
| | | | | | | | | | Found-by: Timothy Gu <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avdevice/x11grab: fix cursor drawing in multi-screen setupAntonio Ospite2014-09-091-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avdevice/x11grab: rename the "w" Window to "root" in paint_mouse_pointerAntonio Ospite2014-09-091-3/+3
| | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avfilter/vf_cropdetect: Do not check lines or columns twice on black framesMichael Niedermayer2014-09-091-2/+2
| | | | | | | | | | Idea from patch by: hjiodjf 97xgw46 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mpeg: increase score for short mpeg-ps by 1Michael Niedermayer2014-09-091-1/+1
| | | | | | | | | | | | Fixes Ticket 3855 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'Michael Niedermayer2014-09-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1ec335513f95bf2441f81d761ea127325ecd81a0': time: Add missing zero Conflicts: libavutil/time.c See: ebef9f5a56d7df91e010a177a80cfc8dbe394305 Merged-by: Michael Niedermayer <[email protected]>
| * time: Add missing zeroGabriel Dume2014-09-081-1/+1
| | | | | | | | | | | | Leftover of 56d7df91e010a177a80cfc8dbe394305 Signed-off-by: Luca Barbato <[email protected]>
* | avcodec/mpeg4videodec: fix 'libavcodec/mpeg4videodec.c:2762:22: warning: ↵Michael Niedermayer2014-09-081-7/+7
| | | | | | | | | | | | unused variable mpeg4_vdpau_class [-Wunused-const-variable]' Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/cabac_functions: fix "warning: UNCHECKED_BITSTREAM_READER is not ↵Michael Niedermayer2014-09-081-0/+4
| | | | | | | | | | | | defined, evaluates to 0" Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/diracdec: Fix "warning: comparison of constant 4 with expression of ↵Michael Niedermayer2014-09-081-1/+2
| | | | | | | | | | | | type enum dirac_subband is always true [-Wtautological-constant-out-of-range-compare]" Signed-off-by: Michael Niedermayer <[email protected]>
* | Revert the default for ffplay to -noautoexit.Carl Eugen Hoyos2014-09-083-3/+1
| | | | | | | | Reviewed-by: Marton Balint
* | Print bits_per_raw_sample for ffprobe -show_streams.Carl Eugen Hoyos2014-09-088-8/+20
| | | | | | | | Fixes ticket #3919.
* | Print the actual bit depth for audio if it is different from the sample_fmt ↵Carl Eugen Hoyos2014-09-081-0/+4
| | | | | | | | | | | | bit depth. This is already done for video.
* | avcodec/ac3dec_fixed: remove unused arraysMichael Niedermayer2014-09-081-12/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/rtpdec_qt: Fix 'warning: passing argument 2 of ffio_init_context ↵Michael Niedermayer2014-09-081-1/+1
| | | | | | | | | | | | discards const qualifier from pointer target type' Signed-off-by: Michael Niedermayer <[email protected]>
* | MAINTAINERS: add myself as segment maintainerStefano Sabatini2014-09-081-0/+1
| |
* | lavf/segment: abort in case of invalid segment format optionsStefano Sabatini2014-09-081-1/+4
| |
* | avformat/utils: Exclude the header size when computing duration from bit_rateHendrik Leppkes2014-09-081-1/+2
| | | | | | | | | | | | | | | | This improves the estimate for MP3s with cover art tags. Fixes Ticket2931 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d'Michael Niedermayer2014-09-086-8/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d': Split off floating point AAN (I)DCT into separate components Conflicts: configure libavcodec/Makefile libavcodec/dct-test.c libavcodec/idctdsp.c Merged-by: Michael Niedermayer <[email protected]>
| * Split off floating point AAN (I)DCT into separate componentsDiego Biurrun2014-09-076-9/+26
| |
* | Merge commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0'Michael Niedermayer2014-09-081-0/+2
|\| | | | | | | | | | | | | * commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0': ismindex: Avoid writing ismf files if no base name has been specified Merged-by: Michael Niedermayer <[email protected]>
| * ismindex: Avoid writing ismf files if no base name has been specifiedMartin Storsjö2014-09-071-0/+2
| | | | | | | | | | | | | | | | Previously, this could create files named "(null).ismf", if the -ismf parameter is specified (before an input file name), but without specifying any base name. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '803e82276b3716bf6012ec69e8854dae14a4fd2b'Michael Niedermayer2014-09-082-9/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '803e82276b3716bf6012ec69e8854dae14a4fd2b': libavformat: Check mkdir return error codes Conflicts: libavformat/hdsenc.c libavformat/smoothstreamingenc.c See: c89f8f80cc83622471eaf99e451e78df68475e19 See: a3886ea3c5947ca05bfe01b053d9ce2f9725d9eb Merged-by: Michael Niedermayer <[email protected]>
| * libavformat: Check mkdir return error codesMartin Storsjö2014-09-072-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the returned error codes were intentionally ignored (see fadd3a68213), to avoid aborting if the directory already existed. If the mkdir actually failed, this was caught when opening files within the directory fails anyway. By handling the error code here (but explicitly ignoring EEXIST), the error messages and return codes in these cases are more appropriate and less confusing. Signed-off-by: Martin Storsjö <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-08 13:11:49 +0000