Michael Niedermayer
5313d60dc0
Merge commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1'
...
* commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1':
oggenc: Move ogg_write_pages up above ogg_write_header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
48a6916308
Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'
...
* commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c':
dsputil: Split off HuffYUV encoding bits into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvenc.c
libavcodec/pngenc.c
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e2abc0d5ca
Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d'
...
* commit '0d439fbede03854eac8a978cccf21a3425a3c82d':
dsputil: Split off HuffYUV decoding bits into their own context
Conflicts:
configure
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvdec.c
libavcodec/lagarith.c
libavcodec/vble.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
43c57dbe14
Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58'
...
* commit '888dcd86755d37e55fd74166f6d38ad66d41db58':
h264_picture: Remove pointless dsputil.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d84286b1ea
Merge commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0'
...
* commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0':
on2avc: Remove pointless dsputil.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5be8c27694
avformat/rtspdec: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
2870617853
avcodec/vp3: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
0674da997a
avcodec/cavs: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Lou Logan
8a64ea768b
doc/filters: amix only supports float samples
...
Signed-off-by: Lou Logan <lou@lrcd.com>
11 years ago
Andrew Kelley
1d3eb0b573
oggenc: Move ogg_write_pages up above ogg_write_header
...
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Michael Niedermayer
1853e2cba9
avfilter/formats: Avoid using non public AV_SAMPLE_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
512f3ffe9b
dsputil: Split off HuffYUV encoding bits into their own context
...
Also shorten HuffYUV context member names to avoid clutter.
11 years ago
Diego Biurrun
0d439fbede
dsputil: Split off HuffYUV decoding bits into their own context
...
Also shorten HuffYUV context member names to avoid clutter.
11 years ago
Michael Niedermayer
0d26264fb4
avfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ee0c91cc65
avfilter/vf_telecine: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
515e8aed03
avfilter/vf_transpose: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e10ac3a12e
avfilter/vf_swapuv: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cfa0ad6eec
avfilter/vf_noise: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1dbc98461b
avfilter/vf_mergeplanes: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c0f8801e47
avfilter/il: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5feac96fdb
avfilter/hflip: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
f3fdc32e2f
avfilter/crop: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
64fb19cc99
avfilter/formats: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Andreas Cadhalpun
0f17bc644c
Improve the detection of architecture x86.
...
This fixes building on Debian GNU/Hurd.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
James Almer
5863207086
x86/dsputilenc: use HADDD in ff_sse16_sse2
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
888dcd8675
h264_picture: Remove pointless dsputil.h #include
11 years ago
Diego Biurrun
f1df0a4c08
on2avc: Remove pointless dsputil.h #include
11 years ago
James Almer
e64e079ece
x86/dsputilenc: implement SSE2 version of diff_pixels
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a0c5cd3475
avcodec/x86/dsputilenc: set the count of SSE registers correctly for get_pixels
...
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a1cb4efd2f
Merge commit '7cc4c9f32f446feaec5447e3d097e8147e35f156'
...
* commit '7cc4c9f32f446feaec5447e3d097e8147e35f156':
lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
50ffd8439c
Merge commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444'
...
* commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444':
buffersrc: avoid using AV_PIX_FMT_NB
Conflicts:
libavfilter/buffersrc.c
No change as AV_PIX_FMT_NB was not used by our buffersrc.c
See: 0d58bbb28d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cdf6a9441d
Merge commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3'
...
* commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3':
vf_fieldorder: avoid using AV_PIX_FMT_NB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
de5ec08825
Merge commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8'
...
* commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8':
vf_scale: use the pixfmt descriptor API
Conflicts:
libavfilter/vf_scale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a37f2cc579
avfilter/vf_format: fix duplicate ;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6e9dbee7c6
Merge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece'
...
* commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece':
vf_format: rework format list parsing
Conflicts:
libavfilter/vf_format.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e222cfefcd
Merge commit '4d8c28deab2488579f585406110b1be790896e59'
...
* commit '4d8c28deab2488579f585406110b1be790896e59':
imgutils: make systematic palette opaque.
Conflicts:
libavutil/imgutils.c
See: 4d8c28deab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
e6a084641a
avformat/utils: set max analyze duration depending on the circumstances
...
Fixes Ticket3673
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
52887aa409
avformat: move default for max_analyze_duration into utils.c
...
this way we can do better tha a single fixed constant value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Anton Khirnov
7cc4c9f32f
lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB
...
Thatt hardcodes the number of formats into lavfi and will break when a
shared lavu is updated, adding new formats.
11 years ago
Anton Khirnov
b03b2d86aa
buffersrc: avoid using AV_PIX_FMT_NB
...
That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.
11 years ago
Anton Khirnov
a7d070acb5
vf_fieldorder: avoid using AV_PIX_FMT_NB
...
That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.
11 years ago
Anton Khirnov
862f33c10e
vf_scale: use the pixfmt descriptor API
...
Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.
11 years ago
Anton Khirnov
45fc73edfe
vf_format: rework format list parsing
...
Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.
11 years ago
Lou Logan
60ef61242c
MAINTAINERS: add Trac maintainers
...
Signed-off-by: Lou Logan <lou@lrcd.com>
11 years ago
Lou Logan
5b1a56b34b
doc/ffmpeg: note that -t is also an input option
...
Signed-off-by: Lou Logan <lou@lrcd.com>
11 years ago
Lou Logan
2dbf5e7038
configure: s/solving/solve
...
Signed-off-by: Lou Logan <lou@lrcd.com>
11 years ago
Clément Bœsch
53bac1b4bd
doc: add a tutorial for writing filters.
11 years ago
Michael Niedermayer
d35000c2dc
avcodec/g723_1: fix writing into input frame data and warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
2d56f0d054
Write the actual mp3 frame size when muxing into caf if available.
...
Fixes ticket #3648 .
11 years ago
Michael Niedermayer
2db89765f3
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
ffmpeg: use thread message API.
lavu: add thread message API.
compat/w32pthreads: add return value to pthread_cond_init().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago