de182701ac
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lagarith: Fix typo in printf format string
Conflicts:
libavcodec/lagarith.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
9d6a27d533
Merge commit '57f09608e1600d1cf1679885a46f5004d522d68f'
* commit '57f09608e1600d1cf1679885a46f5004d522d68f':
dsputil: Move thirdpel-related bits into their own context
Conflicts:
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
74fed968d1
Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'
* commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f':
x86: dsputil: Move hpeldsp-related declarations to a separate header
Conflicts:
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
816d7936a7
Merge commit 'ae116cd3ed908d28b69d5198712217ec743d74f6'
* commit 'ae116cd3ed908d28b69d5198712217ec743d74f6':
ppc: dsputil: Move hpeldsp-related declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
9333bba6ed
Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'
* commit '6655c933a887a2d20707fff657b614aa1d86a25b':
x86: dsputil: Move fpel declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
77bc342975
Merge commit '322a1dda973e802db7b57f2007fad3efcd5bab81'
* commit '322a1dda973e802db7b57f2007fad3efcd5bab81':
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
Conflicts:
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
672c610d84
Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'
* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
d6d3cfb0aa
Merge commit '600b854ad8173995518bd917e7f86120b5505088'
* commit '600b854ad8173995518bd917e7f86120b5505088':
imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil
Conflicts:
libavcodec/imgconvert.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
8fbc6e5911
Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'
* commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd':
x86: dsputil: Move inline assembly macros to a separate header
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
32da2fd422
Merge commit '1df0b061621b10edde87e3ab7ea83aed381c574f'
* commit '1df0b061621b10edde87e3ab7ea83aed381c574f':
nuv: Reuse the DSPContext from RTJpegContext
Conflicts:
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
82c742377a
avutil/dynarray: remove debug av_log() from AV_DYNARRAY_ADD
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
9ba1190297
avutil/mem: avoid using intptr_t to access void* in av_dynarray_add()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
b0dcf76530
lavu/mem: reimplement the dynarray functions with the macro.
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
7b9a310d0e
lavu: add AV_DYNARRAY_ADD() macro.
Signed-off-by: Nicolas George <george@nsup.org>
Reviewed-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
cd1d4b51e3
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float_dsp: Replace arch optimization ifdefs by if cascade
Conflicts:
libavutil/float_dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
8d024c5107
Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'
* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198':
avcodec: more correct printf specifiers
Conflicts:
libavcodec/4xm.c
libavcodec/alsdec.c
libavcodec/dfa.c
libavcodec/h264_ps.c
libavcodec/jpeg2000dec.c
libavcodec/lagarith.c
libavcodec/mpeg12dec.c
libavcodec/rv10.c
libavcodec/svq3.c
libavcodec/wmaprodec.c
libavcodec/xwddec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
4f4840377f
lagarith: Fix typo in printf format string
libavcodec/lagarith.c:671:16: warning: '#' flag used with ‘%u’ gnu_printf format [-Wformat]
12 years ago
7ef8d97b1a
Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'
* commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da':
avfilter: more correct printf format specifiers
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
54df8b4fea
fate: add cine demux test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
ae4b11df0d
avcodec/snowenc: make snow non experimental
After this commit the created bitstream will be supported by future
decoders.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
3eafe1d71c
udp: try to clarify verbiage on buffer_size
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
0b4c5c99bc
avformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unable to be set high enough
which can happen easily in linux
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
57f09608e1
dsputil: Move thirdpel-related bits into their own context
12 years ago
82dd1026cf
x86: dsputil: Move hpeldsp-related declarations to a separate header
12 years ago
ae116cd3ed
ppc: dsputil: Move hpeldsp-related declarations to a separate header
12 years ago
6655c933a8
x86: dsputil: Move fpel declarations to a separate header
12 years ago
322a1dda97
dsputil: Refactor duplicated CALL_2X_PIXELS / PIXELS16 macros
12 years ago
f9279ee749
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
12 years ago
600b854ad8
imgconvert: Move ff_deinterlace_line_*_mmx declarations out of dsputil
12 years ago
1a8d0cf77e
x86: dsputil: Move inline assembly macros to a separate header
12 years ago
1df0b06162
nuv: Reuse the DSPContext from RTJpegContext
There is no point in populating NuvContext with another DSPContext.
Also split static and dynamic initialization bits to avoid running the
static initialization parts over and over.
12 years ago
46caba4a65
float_dsp: Replace arch optimization ifdefs by if cascade
Arch-specific optimizations are handled this way everywhere else.
12 years ago
cc8163e1a3
avcodec: more correct printf specifiers
12 years ago
cd5cf395f6
Additional icl inline asm fix.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
7513234bdd
avfilter: more correct printf format specifiers
12 years ago
f02832904d
lavc/libx264: add a warning when using qscale
This addresses ticket #3238 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
6abc56e892
dshow: use distinct buffers per stream.
Basically sometimes if you start dropping video packets, you also drop audio packets. Now they each have separate buffers to avoid this unexpected behavior.
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
87ecefdab0
elbg: change utility_inc to 64bit
Fixes integer overflow
Fixes Ticket3462
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
d003a0cd2e
avformat/mp3enc: use av_copy_packet()
Fixes double free
Fixes Ticket3476
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
1b4f2fb165
avcodec/snowdec: also print qbias and mvscale in debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
2fb388fc9d
avcodec/snowdec: forward error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
296aa4ac01
avcodec/snowdec: return more specific error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
8a5ea5b9ef
avcodec/snowenc: simplify spatial_decomposition_count seting code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
76c8fbc5f2
http: never send 'Cookie: (null)' to the server
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 <michaelni@gmx.at>
12 years ago
2fd14f062c
avcodec/snowenc: allow larger mb variances
Fixes assertion failure
Fixes Ticket3463
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
b4356c9cc2
avcodec/ratecontrol: make (mc_)mb_var_sum(_last) 64bit
This avoids hypothetical integer overflows
12 years ago
e92a78a409
avcodec/mpegvideo: make mc_mb_var_sum / mb_var_sum 64bit
This avoids a hypothetical integer overflow with very high resolution video
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
c3272674c9
avcodec/mpegvideo: make mc_mb_var_sum_temp / mb_var_sum_temp 64bit
This avoids a hypothetical integer overflow with very high resolution video
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
db55365d0f
configure: Try to fix detection of ARM Compiler 5.04
Fixes Ticket 3364
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
9dca02ee54
ffmpeg: dont call exit_program() from a signal hander
This is unsafe and can deadlock amongth other things
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
Nicolas George
Diego Biurrun
Peter Ross
rogerdpack
Matt Oliver
James Darnley
wm4