Michael Niedermayer
90eaa989f1
x86/videodsp_init: Add back lost author attribution
...
Code originates from:
910b9f30
libavcodec/dsputil.c (David Conrad 2010-05-27 04:39:27 +0000 334) void ff_emulated_edge_mc(uint8_t *buf, const uint8_t *src, int linesize, int block_w, int block_h,
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 335) int src_x, int src_y, int w, int h){
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 336) int x, y;
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 337) int start_y, start_x, end_y, end_x;
b5a093b3
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-25 20:22:36 +0000 338)
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 339) if(src_y>= h){
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 340) src+= (h-1-src_y)*linesize;
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 341) src_y=h-1;
225f9c44
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 342) }else if(src_y<=-block_h){
225f9c44
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 343) src+= (1-block_h-src_y)*linesize;
225f9c44
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 344) src_y=1-block_h;
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 345) }
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 346) if(src_x>= w){
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 347) src+= (w-1-src_x);
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 348) src_x=w-1;
225f9c44
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 349) }else if(src_x<=-block_w){
225f9c44
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 350) src+= (1-block_w-src_x);
225f9c44
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-15 00:25:53 +0000 351) src_x=1-block_w;
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 352) }
93a21abd
libavcodec/mpegvideo.c (Michael Niedermayer 2002-07-14 18:37:35 +0000 353)
b8a78f41
libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 354) start_y= FFMAX(0, -src_y);
b8a78f41
libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 355) start_x= FFMAX(0, -src_x);
b8a78f41
libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 356) end_y= FFMIN(block_h, h-src_y);
b8a78f41
libavcodec/mpegvideo.c (Michael Niedermayer 2002-11-10 11:46:59 +0000 357) end_x= FFMIN(block_w, w-src_x);
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-22 00:58:08 +01:00
Michael Niedermayer
28286a63d0
videodsp_template.c: fix year
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-22 00:58:08 +01:00
Stefano Sabatini
e64a7f2c78
doc/default.css: use ffmpeg.org website CSS
...
The attribute container of the top-level div is changed from "class" to
"id" to match the website CSS.
Improve consistency between website docs and local documentation style.
2012-12-22 00:38:48 +01:00
Stefano Sabatini
042c2a1af8
doc: move HTML CSS to a dedicated file default.css
2012-12-22 00:38:41 +01:00
Paul B Mahol
185d1f3bfc
lavfi: declare arrays that never change as static const
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-21 22:38:59 +00:00
Michael Niedermayer
165be91c2b
img2enc: fix typo
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 22:56:13 +01:00
Michael Niedermayer
2f436b1fce
lavc: Warn in case the set bitrate is very low
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 22:50:57 +01:00
rogerdpack
d828bae9d2
better failure message for img2enc
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 21:18:12 +01:00
Piotr Bandurski
0e3a4da106
yop: set video bit rate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 21:18:12 +01:00
Paul B Mahol
a8ebb77493
lavfi/swapuv: use FFSWAP
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-21 19:04:11 +00:00
Carl Eugen Hoyos
a3a22c2178
Revert "Always write all colours for animated gif files, including transparent ones."
...
It breaks some opaque samples.
This reverts commit d4fdaafdb7
.
2012-12-21 18:18:39 +01:00
Carl Eugen Hoyos
0fb79f30db
Support H264 over video4linux2.
...
Tested-by: Val Malykh
2012-12-21 18:12:29 +01:00
Michael Niedermayer
1b598e6776
Merge commit 'c7d4de3d730473167e31cf765e0333c965f934d3'
...
* commit 'c7d4de3d730473167e31cf765e0333c965f934d3':
rtpdec_vp8: Don't return known-broken packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 17:51:31 +01:00
Michael Niedermayer
bb3420d88e
Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59'
...
* commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59':
rtpdec: Pass the sequence number to depacketizers
configure: Make avconv depend on null, anull and resample filters
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 17:46:43 +01:00
Michael Niedermayer
be2c0adc96
Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'
...
* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885':
build: avfilter: Remove duplicate compilation entry for vf_scale
Conflicts:
libavfilter/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 17:39:03 +01:00
Michael Niedermayer
d27edc038a
Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'
...
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
miscellaneous typo fixes
Conflicts:
libavcodec/4xm.c
libavcodec/lagarith.c
libavcodec/parser.c
libavcodec/ratecontrol.c
libavcodec/shorten.c
libavcodec/vda_h264.c
libavformat/dvenc.c
libavformat/wtv.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 17:32:52 +01:00
Michael Niedermayer
a41bf09d9c
Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'
...
* commit '6906b19346ae8a330bfaa1c16ce535be10789723':
lavc: add missing files for arm
lavc: introduce VideoDSPContext
Conflicts:
configure
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 17:18:43 +01:00
Paul B Mahol
fb3f28ee28
alsdec: cosmetics after previous commit
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-21 14:14:57 +00:00
Paul B Mahol
ae27b70b9d
alsdec: channel sorting
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-21 14:11:12 +00:00
Michael Niedermayer
29707f5ba6
Merge commit 'a925f723a915bc0255e2673f8817af5212131763'
...
* commit 'a925f723a915bc0255e2673f8817af5212131763':
rtp: Don't read priv_data unless it is allocated
flvenc: Check whether seeking back to the header succeeded
sapenc: Pass the title on to the chained muxers
Conflicts:
libavformat/flvenc.c
libavformat/sapenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 14:06:42 +01:00
Martin Storsjö
c7d4de3d73
rtpdec_vp8: Don't return known-broken packets
...
This is built on the assumption that the first partition of each
VP8 packet is essential for decoding any later packet - if this
partition is broken/missed, the arithmetic coder gets out of sync
and decoding the bitstream in further packet ends up with total
garbage. If packets of a frame are lost, make sure the first
partition is intact (return only this part of the packet, nothing
else), otherwise stop returning data until the next keyframe is
received.
Alternatively, one would simply not return any packets at all
until the next keyframe, if packet loss is detected.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-12-21 14:14:47 +02:00
Martin Storsjö
90c784cc13
rtpdec: Pass the sequence number to depacketizers
...
This allows depacketizers to figure out if packets have been lost.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-12-21 14:14:40 +02:00
Michael Niedermayer
63753186cc
lavf: Remove "Adjusting PTS forward" code
...
it causes problems (incorrectly detect TS discontinuities)
with a brokan TS file (test-audio-broken.ts)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 05:12:05 +01:00
Paul B Mahol
cfa530034f
gifdec: remove dead store
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-21 00:33:14 +00:00
Michael Niedermayer
230bef0a89
ffplay: fix handling of resolution changes with h264-mt
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21 00:50:47 +01:00
Carl Eugen Hoyos
9eca649a92
Fix compilation with --disable-everything --enable-muxer=mov.
2012-12-21 00:27:34 +01:00
Diego Biurrun
0a0e340f5b
configure: Make avconv depend on null, anull and resample filters
...
Building avconv without that functionality makes little sense.
2012-12-21 00:21:53 +01:00
Diego Biurrun
69f086e0f9
build: avfilter: Remove duplicate compilation entry for vf_scale
...
vf_scale should not be unconditionally compiled even if disabled.
2012-12-21 00:18:34 +01:00
Diego Biurrun
511cf612ac
miscellaneous typo fixes
2012-12-21 00:18:34 +01:00
Stefano Sabatini
340b7caf54
lavf/hlsenc: provide some feedback in case of invalid basename
2012-12-21 00:07:21 +01:00
Stefano Sabatini
28b96efab5
lavf/hlsenc: fix minor grammar inconsistencies in the option help messages
2012-12-21 00:07:13 +01:00
Stefano Sabatini
b448677e6e
doc: remove inclusion of libav* documentation in tools
...
This shrinks the tool manuals to a manageable size. Relevant manuals are
referenced in the "See Also" chapter.
Overall documentation inclusion should still be possible through the use
of a conditional variable set during configuration time, if someone feels
the need for a huge-wall-of-text-fashioned manual.
2012-12-20 23:48:23 +01:00
Stefano Sabatini
ca3327d56f
doc/ffmpeg-formats: include metadata chapter
...
The metadata muxer/demuxer belongs to the formats documentation.
2012-12-20 23:46:56 +01:00
Carl Eugen Hoyos
d4fdaafdb7
Always write all colours for animated gif files, including transparent ones.
...
This fixes the colour of the transparent background (as seen with ffplay),
and makes the background of some non-keyframes transparent that was
incorrectly shown as opaque for some samples.
2012-12-20 23:05:42 +01:00
Paul B Mahol
9321e93502
gifdec: fix invalid write in gif_copy_img_rect
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-20 17:56:52 +00:00
Paul B Mahol
c004de0b1c
gifdec: fix invalid write in giff_fill_rect
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-20 17:46:05 +00:00
Michael Niedermayer
103410d67e
ffmpeg_opt: fix recording time in->out carryover.
...
This should fix valgrind complaints.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 17:45:43 +01:00
Nicolas George
c7a1239bf9
lavfi/af_aconvert: update audio->channels.
2012-12-20 17:01:35 +01:00
Piotr Bandurski
17714adbf8
tiffdec: support LZW compression with inverted FillOrder
2012-12-20 15:38:52 +00:00
Clément Bœsch
217bdd08e3
lavf/srtdec: reindent after previous commits.
2012-12-20 16:13:53 +01:00
Clément Bœsch
6c26fc7704
lavf/srtenc: honor subtitle position side data.
2012-12-20 16:13:52 +01:00
Clément Bœsch
1dab8d9157
lavf/srtdec: switch to FFDemuxSubtitlesQueue API.
2012-12-20 16:13:52 +01:00
Clément Bœsch
0072116ccb
lavf: split packets before muxing.
...
After demuxing, data and side are merged. Before decoding, they are
split. Encoder will perform with data and side split. This means that a
muxer can receive split data (after encoding) but also merged data (if
called directly after demuxing). This commit makes sure data and side
are split for the muxer.
2012-12-20 16:13:52 +01:00
Piotr Bandurski
52f2176366
aiffenc: set correct number of bits foru8 in aiff
...
with this change QuickTime is able to play u8 aiff file generated by FFmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 16:05:30 +01:00
Luca Barbato
6906b19346
lavc: add missing files for arm
...
Across the many retouches those did not make the main commit.
2012-12-20 14:07:23 +01:00
Ronald S. Bultje
8c53d39e7f
lavc: introduce VideoDSPContext
...
Move some functions from dsputil. The idea is that videodsp contains
functions that are useful for a large and varied set of video decoders.
Currently, it contains emulated_edge_mc() and prefetch().
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-12-20 13:40:45 +01:00
Martin Storsjö
a925f723a9
rtp: Don't read priv_data unless it is allocated
...
This makes all users of rtpenc_chain (rtsp muxer, sapenc, mov
rtp hinting) work again, broken since 8034130e0
.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-12-20 14:25:49 +02:00
Nicolas George
0146c1f0f1
lavfi: remove init and check of rate and layout.
...
The sample rate and channel layout are negotiated and set
by the filter graph system.
2012-12-20 13:03:42 +01:00
Nicolas George
5033a1af17
lavfi/buffersrc: remove init of rate and layout.
...
The sample rate and channel layout are negotiated and set
by the filter graph system, the filters must not set them.
2012-12-20 13:03:42 +01:00
Nicolas George
34de47aa35
lavfi: add an accessor for ref->audio->channels.
2012-12-20 13:03:41 +01:00