Michael Niedermayer
b4f64c58fc
Merge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'
...
* commit 'da5be235250a61d6994408b054e3e3acf2e0f90f':
dsputil: Move RV40-specific bits into rv40dsp
Conflicts:
libavcodec/dsputil.c
libavcodec/rv40dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6967cf3c6c
Merge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'
...
* commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed':
hpeldsp_template: Detemplatize the code
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e9c6b93bda
Merge commit '2c01ad8b206d326700974438f7193f22be416eb1'
...
* commit '2c01ad8b206d326700974438f7193f22be416eb1':
dsputil_template: Detemplatize the code
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0371eaebcd
Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'
...
* commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f':
Add missing headers to make template files compile (more) standalone
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
3262069101
Merge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08'
...
* commit 'e7373585f827d4ec05d952daa3877e8decfe3c08':
dsputil_template: Move bits that are used templatized into separate file
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
152c8fd856
Merge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f'
...
* commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f':
dsputil: Move hpel_template #include out of dsputil_template
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8e8347b892
Merge commit 'd0aabeab23755ee906440505ad2097c0f1493e80'
...
* commit 'd0aabeab23755ee906440505ad2097c0f1493e80':
x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation
See: c8246d3766
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
efc7290eb6
x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init
...
There is no point in having a separate file just for the instantiation
that provides the public functions.
11 years ago
Diego Biurrun
55d7f26e7b
hpeldsp_template: Move content to hpeldsp
...
There is no point in having this separate; it is not used as a template.
11 years ago
Diego Biurrun
09d4389de1
hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions
11 years ago
Diego Biurrun
92ba965103
dsputil: Move draw_edges and clear_block* out of dsputil_template
...
The functions are not used templatized.
11 years ago
Diego Biurrun
da5be23525
dsputil: Move RV40-specific bits into rv40dsp
11 years ago
Diego Biurrun
8011ac911b
hpeldsp_template: Detemplatize the code
...
The indirection makes no sense without multiple instantiation.
11 years ago
Diego Biurrun
2c01ad8b20
dsputil_template: Detemplatize the code
...
The indirection makes no sense without multiple instantiation.
11 years ago
Diego Biurrun
aba70bb538
Add missing headers to make template files compile (more) standalone
11 years ago
Diego Biurrun
e7373585f8
dsputil_template: Move bits that are used templatized into separate file
...
This allows detemplatizing the bits that are not instantiated twice.
11 years ago
Diego Biurrun
d3c3c1664a
dsputil: Move hpel_template #include out of dsputil_template
...
Multiple inclusion makes no sense as it is only used in the 8-bit case.
11 years ago
Diego Biurrun
d0aabeab23
x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation
...
This fixes FATE with mmxext CPUFLAGS set.
11 years ago
Michael Niedermayer
c05065aac0
avcodec/h261: move b_stride/b_xy under the if() where they are used
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6795dcfa65
avcodec/hevc: Export picture type
...
This only uses the first slice, improvement here is welcome
analyzing all slices the trivial way would interfere with threads
Fixes Ticket3185
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
4090d5baa8
avcodec/h261dec: fix motion vector vissualization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8f20e3d4df
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avcodec: add missing includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
41e7e46cac
Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'
...
* commit 'aa499568afc01d59215eef7e5b14b949a9671afc':
avconv: More descriptive message about framedrop
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
10e931d514
Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'
...
* commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3':
vf_transpose: K&R formatting cosmetics
Conflicts:
libavfilter/vf_transpose.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
2d9821a208
x86/cpu: check for OS support before enabling AVX2
...
AV_CPU_FLAG_AVX is enabled at this point only if there's OS support.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
rogerdpack
4d9881e1cc
udp: mention default in documentation
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
rogerdpack
10056bc964
dshow: log error and continue if unable to set audio buffer
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
0816abae1e
Add an .oga muxer.
11 years ago
Carl Eugen Hoyos
e6fe804bdd
Do not set swscale sizeFactor to -1.
...
Fixes ticket #3495 .
11 years ago
Øyvind Kolås
3e6016622e
swscale: add two spatially stable dithering methods
...
Both of these dithering methods are from http://pippin.gimp.org/a_dither/ for
GIF they can be considered better than bayer (provides more gray-levels), and
spatial stability - often more than twice as good compression and less visual
flicker than error diffusion methods (the methods also avoids error-shadow
artifacts of diffusion dithers).
These methods are similar to blue/green noise type dither masks; but are
simple enough to generate their mask on the fly. They are still research work
in progress; though more expensive to generate masks (which can be used in a
LUT) like 'void and cluster' and similar methods will yield superior results
11 years ago
Peter Ross
a490970af2
libavcodec/*/vp8dsp_init: indent
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Peter Ross
4a031ce3c6
avformat/riff: add On2 VP7 fourccs
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Peter Ross
89f2f5dbd7
On2 VP7 decoder
...
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: BBB
previous patch reviewed by jason
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Peter Ross
7d4c0220f1
avcodec/vp8: vp8_find_free_buffer
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Vittorio Giovara
dc0c70e018
avcodec: add missing includes
11 years ago
Vittorio Giovara
aa499568af
avconv: More descriptive message about framedrop
11 years ago
Vittorio Giovara
6ee55c7b11
vf_transpose: K&R formatting cosmetics
11 years ago
Michael Niedermayer
a81ee2651f
avcodec/svq1enc: fix undefined pointer operation
...
Fixes Ticket3152
This also removes the dependance on ff_init_block_index/ff_update_block_index()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c25d2cd20b
avcodec/x86/mpegvideoenc_template: fix integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
575b957758
dox/scaler:fix bicubiclin typo
...
See Ticket3486
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5d39ec2188
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libx265: Only use one memcpy for headers
See: ecb5b9c098
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
fc2de9b7cf
Merge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed'
...
* commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed':
libx265: Write global extradata when requested
See: dded5ed9c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ab8d9fe9b8
Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'
...
* commit '8ef33497a6a3ed05d2f931809c074ef3d1878834':
build: Add config option for CABAC code
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
bce2abc936
avcodec/h264: use ff_h264_set_erpic() instead of memset
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cb640eb335
ffmpeg: move packet deallocation into write_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
33a7e288ab
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avconv: don't warn on multiple frames per packet for codecs that expect it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1046cd60d4
Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'
...
* commit '4754345027eb85cfa51aeb88beec68d7b036c11e':
avconv: print verbose per-stream transcoding statistics
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
afa442c198
Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'
...
* commit 'a220b07b0f971f88213aef012aea51af2800be62':
avconv: split printing the final statistics into a separate function
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Derek Buitenhuis
ecb5b9c098
libx265: Only use one memcpy for headers
...
They're guaranteed by the x265 API to be contiguous in memory.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago
Derek Buitenhuis
206d5330f6
libx265: Simple cosmetic fix
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
11 years ago