Michael Niedermayer
98a6806fdd
Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'
...
* commit '368f50359eb328b0b9d67451f56fda20b3255f9a':
dsputil: Split off quarterpel bits into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/qpeldsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d35899ccce
Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b'
...
* commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b':
dsputil: Move Bink-specific add_pixels8 to binkdsp
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
40f3a87c10
Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3'
...
* commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3':
dsputil: Move APE-specific bits into apedsp
Conflicts:
libavcodec/arm/int_neon.S
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5c6e94c42b
Merge commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b'
...
* commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b':
dsputil: Move mspel_pixels_tab to the only place it is used
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a9a312d299
Merge commit '3832a6590156e6abc575bed51cbffa78617ee5fd'
...
* commit '3832a6590156e6abc575bed51cbffa78617ee5fd':
dsputil: Move ff_alternate_*_scan tables to mpegvideo
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c814a6c778
avcodec/x86/svq1enc_mmx: Add author attribution
...
See: 5900637219
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ea0931fb96
Merge commit '65d5d5865845f057cc6530a8d0f34db952d9009c'
...
* commit '65d5d5865845f057cc6530a8d0f34db952d9009c':
dsputil: Move SVQ1 encoding specific bits into svq1enc
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cb8763bda7
Merge commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e'
...
* commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e':
svq1enc: Rename SVQ1Context to SVQ1EncContext
Conflicts:
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b3f4615081
ffmpeg: fix check for muxing overhead being unknown
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
02a3e327f1
x86/dsputilenc: add missing guards to ff_pix_sum16_xop
...
XOP support was added in Yasm 1.0.0 and Nasm 2.06, and we still
support older versions.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Christophe Gisquet
99a319c4e7
x86: huffyuvdsp: port add_bytes to yasm
...
C MMX SSE2
Cycles: 2972 587 302
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Christophe Gisquet
2267003981
x86: hpeldsp: better factorization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Christophe Gisquet
bf7e9cc82a
tests: allow passing dimensions to videogen
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7b4c46050e
rename add_hfyu_left_prediction_int16 to add_hfyu_left_pred_int16
...
This makes the naming more consistent with the 8bit variant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
550ae6c02f
rename add_hfyu_median_prediction_int16 to add_hfyu_median_pred_int16
...
This makes the naming more consistent with the 8bit variant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
40a4ab8ba4
rename sub_hfyu_median_prediction_int16 to sub_hfyu_median_pred_int16
...
This makes the naming more consistent with the 8bit variant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
05de4d3011
x86/dsputilenc: implement XOP version of pix_sum16
...
SSE2: 137 cycles
XOP: 87 cycles
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
232959f184
Merge commit '08cd92144e73195eecc28ed0348e66e255516b82'
...
* commit '08cd92144e73195eecc28ed0348e66e255516b82':
aarch64: Use the correct syntax for relocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
fba0ac2805
avcodec/dpx_parser: Allow frame size to be too small
...
Fixes Ticket3402
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8df5d9aabf
avcodec/dpx_parser: fix flushing end out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f518fb3318
avcodec/dpx_parser: reset index when finding a startcode, not after
...
This is simpler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
368f50359e
dsputil: Split off quarterpel bits into their own context
11 years ago
Diego Biurrun
cb52a17cb6
dsputil: Move Bink-specific add_pixels8 to binkdsp
11 years ago
Diego Biurrun
054013a0fc
dsputil: Move APE-specific bits into apedsp
11 years ago
Diego Biurrun
256da0770e
dsputil: Move mspel_pixels_tab to the only place it is used
11 years ago
Diego Biurrun
3832a65901
dsputil: Move ff_alternate_*_scan tables to mpegvideo
11 years ago
Diego Biurrun
65d5d58658
dsputil: Move SVQ1 encoding specific bits into svq1enc
11 years ago
Diego Biurrun
2ea2612df5
svq1enc: Rename SVQ1Context to SVQ1EncContext
...
This allows making it visible without name clashes.
11 years ago
Christophe Gisquet
25e6310a3e
huffyuv: change left prediction access in BGRA
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Christophe Gisquet
c609f803e1
huffyuv: avoid duplicated defines
...
Move the defines to the dsp header.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Martin Storsjö
08cd92144e
aarch64: Use the correct syntax for relocations
...
This fixes building in PIC mode with gas. The examples in the gas
manual showed using a # here even though gas itself actually didn't
support that syntax (and the gas test suite only tests it without
the extra hash sign).
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Michael Niedermayer
4991eacc06
Merge commit '962d63157322466a9a82f9f9d84c1b6f1b582f65'
...
* commit '962d63157322466a9a82f9f9d84c1b6f1b582f65':
matroskaenc: set the stream timebase earlier
Conflicts:
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e46cc1dab0
Merge commit '43e7f0797f9f821a3866a20f05e512e13c82076a'
...
* commit '43e7f0797f9f821a3866a20f05e512e13c82076a':
flvenc: only write the framerate tag based on avg_frame_rate
Conflicts:
tests/ref/lavf/flv_fmt
tests/ref/seek/lavf-flv_fmt
tests/ref/seek/vsynth2-flv
tests/ref/vsynth/vsynth1-flashsv
tests/ref/vsynth/vsynth1-flv
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a72df4dadc
Merge commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9'
...
* commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9':
movenc: write avg_frame_rate as the framerate, not the codec timebase
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
bc59d39b82
Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'
...
* commit '81eec081afea9fc017a175581ceea7c420a0dfc3':
matroskaenc: base DefaultDuration on the framerate, not the codec timebase
Conflicts:
libavformat/matroskaenc.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
See: ea83b032af
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d9c4f61dab
Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'
...
* commit 'a53551cba86bb67efcb6105fdc337a36c43132bd':
frame: fix the error path in av_frame_copy_props()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anton Khirnov
962d631573
matroskaenc: set the stream timebase earlier
...
Fixes calculating the ts offset for audio codecs with delay.
11 years ago
Anton Khirnov
43e7f0797f
flvenc: only write the framerate tag based on avg_frame_rate
...
Do not fall back on the codec timebase, since that can be anything for
VFR video.
11 years ago
Anton Khirnov
cf6977712c
movenc: write avg_frame_rate as the framerate, not the codec timebase
11 years ago
Anton Khirnov
81eec081af
matroskaenc: base DefaultDuration on the framerate, not the codec timebase
...
This results in DefaultDuration not being written when the framerate is
not known, but as this field is purely informative, this should not
break any sane demuxers.
11 years ago
Roman Savchenko
a53551cba8
frame: fix the error path in av_frame_copy_props()
...
First free metadata, then the side data it is contained in.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Michael Niedermayer
78a79a2ceb
avformat/nutenc: replace conditional by assert
...
Its implied by sp_count==0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6d1aba6a29
avformat/nutenc: limit index table size if no index is going to be written
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
82beb46e65
avformat/nutenc: add mode that omits the index
...
When the index is not written, several data tables become unneeded,
reducing memory and cpu requirements.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
df889be0a8
nutenc: avoid av_tree_find() operation per syncpoint
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6b041cb617
avformat/nutdec: Fix handling of older 4.0 files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
170a4d79c0
avformat/nutenc: bump minor version due to broadcast/pipe
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
45daae06fd
avformat/nutenc: change check to match comment
...
The code appears to assume STABLE will never change
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
99b15f1daa
avformat/nutenc: fix used version value
...
The broadcast/pipe flags arent stable + 1 they would be 4 or whenever but wouldnt change based
on which is stable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
20343cfb51
Merge commit 'ad0fe2f4012031c47268f14b9835088c488e1998'
...
* commit 'ad0fe2f4012031c47268f14b9835088c488e1998':
af_resample: Use avresample_get_out_samples
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago