summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/snowdec: also print qbias and mvscale in debug outputMichael Niedermayer2014-03-211-2/+3
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/snowdec: forward error codesMichael Niedermayer2014-03-211-4/+4
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/snowdec: return more specific error codesMichael Niedermayer2014-03-211-5/+5
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/snowenc: simplify spatial_decomposition_count seting codeMichael Niedermayer2014-03-211-4/+1
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* http: never send 'Cookie: (null)' to the serverwm42014-03-211-1/+1
| | | | | | | | | | | | | If a domain has some cookies set, but matching the cookie fails due to the port being different, get_cookies() succeeds, but sets cookies to NULL. The caller of get_cookies() didn't check for the NULL value. This also avoids passing NULL to libc string functions, which is undefined behavior Fixes Ticket2180 Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/snowenc: allow larger mb variancesMichael Niedermayer2014-03-211-1/+1
| | | | | | | Fixes assertion failure Fixes Ticket3463 Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/ratecontrol: make (mc_)mb_var_sum(_last) 64bitMichael Niedermayer2014-03-212-9/+10
| | | | This avoids hypothetical integer overflows
* avcodec/mpegvideo: make mc_mb_var_sum / mb_var_sum 64bitMichael Niedermayer2014-03-213-5/+5
| | | | | | This avoids a hypothetical integer overflow with very high resolution video Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/mpegvideo: make mc_mb_var_sum_temp / mb_var_sum_temp 64bitMichael Niedermayer2014-03-211-2/+2
| | | | | | This avoids a hypothetical integer overflow with very high resolution video Signed-off-by: Michael Niedermayer <[email protected]>
* configure: Try to fix detection of ARM Compiler 5.04Michael Niedermayer2014-03-211-1/+1
| | | | | | Fixes Ticket 3364 Signed-off-by: Michael Niedermayer <[email protected]>
* ffmpeg: dont call exit_program() from a signal handerMichael Niedermayer2014-03-211-1/+1
| | | | | | This is unsafe and can deadlock amongth other things Signed-off-by: Michael Niedermayer <[email protected]>
* doc/examples/avcodec: information regarding gop_size ignored if ↵Anshul Maheshwari2014-03-211-1/+7
| | | | | | frame->pic-type is AV_PICTURE_TYPE_I Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/x86/snowdsp: add missing clobbers to ↵Michael Niedermayer2014-03-211-0/+1
| | | | | | | | inner_add_yblock_bw_8_obmc_16_bh_even_sse2() and inner_add_yblock_bw_16_obmc_32_sse2() Note, these functions are currently disabled Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/snowdec: provide information about the wavelet with -debug 1Michael Niedermayer2014-03-211-1/+6
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-201-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame Conflicts: libavcodec/vaapi.c libavcodec/vaapi_internal.h See: 377cfc28a226a66d6f872f0a16b3811208011ebc Merged-by: Michael Niedermayer <[email protected]>
| * vaapi: switch ff_vaapi_get_surface_id from Picture to AVFramewm42014-03-206-13/+13
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0'Michael Niedermayer2014-03-201-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0': vdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame Conflicts: libavcodec/vdpau_internal.h libavcodec/vdpau_vc1.c See: 2a37e560dccb81328f610c51e74ce6cc53f1a5c7 Merged-by: Michael Niedermayer <[email protected]>
| * vdpau: switch ff_vdpau_get_surface_id from Picture to AVFramewm42014-03-206-13/+13
| | | | | | | | | | | | | | | | This gets rid of aliasing completely unrelated structs to Picture. Fixes the remaining compilation warnings in the vdpau code. Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '7948a51b5c3d08e1a1173442a7ff72b220def303'Michael Niedermayer2014-03-206-16/+15
|\| | | | | | | | | | | | | | | | | | | * commit '7948a51b5c3d08e1a1173442a7ff72b220def303': vdpau: don't assume Picture and H264Picture are the same Conflicts: libavcodec/vdpau.c Merged-by: Michael Niedermayer <[email protected]>
| * vdpau: don't assume Picture and H264Picture are the samewm42014-03-206-16/+15
| | | | | | | | | | | | | | | | | | The code passed H264Picture* and Picture*, and assumed the hwaccel_picture_private field was in the same place in both structs. Somehow this happened to work in Libav, but broke in FFmpeg (and probably subtly breaks in Libav too). Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '82bb3048013201c0095d2853d4623633d912252f'Michael Niedermayer2014-03-209-91/+95
|\| | | | | | | | | | | | | * commit '82bb3048013201c0095d2853d4623633d912252f': dsputil: Use correct type in me_cmp_func function pointer Merged-by: Michael Niedermayer <[email protected]>
| * dsputil: Use correct type in me_cmp_func function pointerDiego Biurrun2014-03-209-91/+95
| |
* | Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18'Michael Niedermayer2014-03-204-32/+40
|\| | | | | | | | | | | | | | | | | | | | | * commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18': build: Group general components separate from de/encoders in arch Makefiles Conflicts: libavcodec/arm/Makefile libavcodec/x86/Makefile Merged-by: Michael Niedermayer <[email protected]>
| * build: Group general components separate from de/encoders in arch MakefilesDiego Biurrun2014-03-204-31/+39
| | | | | | | | This is in line with how the top-level libavcodec Makefile is structured.
* | Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228'Michael Niedermayer2014-03-202-12/+12
|\| | | | | | | | | | | | | * commit '54a6e08a650a71fd375551585b0ea40a3a06d228': dsputil: Conditionally compile dsputil code on all architectures Merged-by: Michael Niedermayer <[email protected]>
| * dsputil: Conditionally compile dsputil code on all architecturesDiego Biurrun2014-03-202-12/+12
| |
* | Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9'Michael Niedermayer2014-03-2014-86/+86
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5169e688956be3378adb3b16a93962fe0048f1c9': dsputil: Propagate bit depth information to all (sub)init functions Conflicts: libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv5te.c libavcodec/arm/dsputil_init_armv6.c libavcodec/arm/dsputil_init_neon.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/ppc/dsputil_ppc.c libavcodec/x86/dsputil_init.c Merged-by: Michael Niedermayer <[email protected]>
| * dsputil: Propagate bit depth information to all (sub)init functionsDiego Biurrun2014-03-2014-85/+83
| | | | | | | | This avoids recalculating the value over and over again.
* | Merge commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e'Michael Niedermayer2014-03-204-21/+29
|\| | | | | | | | | | | | | | | | | | | * commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e': arm: dsputil: K&R formatting cosmetics Conflicts: libavcodec/arm/dsputil_init_arm.c Merged-by: Michael Niedermayer <[email protected]>
| * arm: dsputil: K&R formatting cosmeticsDiego Biurrun2014-03-204-21/+29
| |
* | Merge commit '1675975216ecbea8e4826235f204dc0f4234383f'Michael Niedermayer2014-03-202-29/+29
|\| | | | | | | | | | | | | * commit '1675975216ecbea8e4826235f204dc0f4234383f': ppc: dsputil: Drop trailing semicolon from macros Merged-by: Michael Niedermayer <[email protected]>
| * ppc: dsputil: Drop trailing semicolon from macrosDiego Biurrun2014-03-202-29/+29
| | | | | | | | This allows for a more natural macro usage.
* | Merge commit 'b7d24fd4b2213104c001ed504074495568600b9c'Michael Niedermayer2014-03-206-270/+219
|\| | | | | | | | | | | | | * commit 'b7d24fd4b2213104c001ed504074495568600b9c': ppc: dsputil: Merge some declarations and initializations Merged-by: Michael Niedermayer <[email protected]>
| * ppc: dsputil: Merge some declarations and initializationsDiego Biurrun2014-03-206-270/+219
| |
* | Merge commit 'b045283f2126637477a597f184638ebef09bf898'Michael Niedermayer2014-03-201-13/+5
|\| | | | | | | | | | | | | * commit 'b045283f2126637477a597f184638ebef09bf898': ppc: dsputil: Simplify some ifdeffed function definitions Merged-by: Michael Niedermayer <[email protected]>
| * ppc: dsputil: Simplify some ifdeffed function definitionsDiego Biurrun2014-03-201-13/+5
| |
* | Merge commit '8bd6f88266740068415f7da0628117f1b802efb9'Michael Niedermayer2014-03-202-9/+9
|\| | | | | | | | | | | | | * commit '8bd6f88266740068415f7da0628117f1b802efb9': ppc: dsputil: Drop some unnecessary parentheses Merged-by: Michael Niedermayer <[email protected]>
| * ppc: dsputil: Drop some unnecessary parenthesesDiego Biurrun2014-03-202-9/+9
| |
* | Merge commit '022184a646896c6b27c6cca387039b030685266e'Michael Niedermayer2014-03-204-416/+437
|\| | | | | | | | | | | | | | | | | | | * commit '022184a646896c6b27c6cca387039b030685266e': ppc: dsputil: more K&R formatting cosmetics Conflicts: libavcodec/ppc/gmc_altivec.c Merged-by: Michael Niedermayer <[email protected]>
| * ppc: dsputil: more K&R formatting cosmeticsDiego Biurrun2014-03-204-416/+437
| |
* | Merge commit '30f3f959879eee7890973e8cc9ce076450ced111'Michael Niedermayer2014-03-203-391/+429
|\| | | | | | | | | | | | | * commit '30f3f959879eee7890973e8cc9ce076450ced111': ppc: dsputil: K&R formatting cosmetics Merged-by: Michael Niedermayer <[email protected]>
| * ppc: dsputil: K&R formatting cosmeticsDiego Biurrun2014-03-203-391/+429
| |
* | Merge commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1'Michael Niedermayer2014-03-207-199/+180
|\| | | | | | | | | | | | | | | | | | | | | * commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1': ppc: dsputil: comment formatting and wording/grammar improvements Conflicts: libavcodec/ppc/gmc_altivec.c libavcodec/ppc/idct_altivec.c Merged-by: Michael Niedermayer <[email protected]>
| * ppc: dsputil: comment formatting and wording/grammar improvementsDiego Biurrun2014-03-207-199/+180
| |
* | Merge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e'Michael Niedermayer2014-03-201-4/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e': hpeldsp_template: Merge some declarations and initializations Conflicts: libavcodec/hpeldsp_template.c Merged-by: Michael Niedermayer <[email protected]>
| * hpeldsp_template: Merge some declarations and initializationsDiego Biurrun2014-03-201-4/+4
| |
* | Merge commit '2539cf1c814190a017cb8986b41aa2f949e37fd9'Michael Niedermayer2014-03-201-213/+297
|\| | | | | | | | | | | | | | | | | | | * commit '2539cf1c814190a017cb8986b41aa2f949e37fd9': hpeldsp_template: K&R formatting cosmetics Conflicts: libavcodec/hpeldsp_template.c Merged-by: Michael Niedermayer <[email protected]>
| * hpeldsp_template: K&R formatting cosmeticsDiego Biurrun2014-03-201-213/+297
| |
* | Merge commit '2972087e398454122a82a970ed07924185175c6d'Michael Niedermayer2014-03-201-3/+3
|\| | | | | | | | | | | | | * commit '2972087e398454122a82a970ed07924185175c6d': hpel_template: Drop some unnecessary parentheses Merged-by: Michael Niedermayer <[email protected]>
| * hpel_template: Drop some unnecessary parenthesesDiego Biurrun2014-03-201-3/+3
| |