Michael Niedermayer
1ecf380223
Merge commit '37063714c0a064808f9671ec4d376955d664f463'
...
* commit '37063714c0a064808f9671ec4d376955d664f463':
build: Only check FATE dependencies when running FATE tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28 11:54:27 +02:00
Michael Niedermayer
102397d2c1
Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'
...
* commit '16c22122c788b5e54a2f2e224bd0106429f0714c':
h264: K&R formatting cosmetics
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28 11:40:49 +02:00
Michael Niedermayer
edab63a406
Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'
...
* commit '966689442ed843019dc0722a49bfb0ac51755d19':
buffersink: K&R formatting cosmetics
Conflicts:
libavfilter/buffersink.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-28 11:26:57 +02:00
Marton Balint
63c0113588
lavc: do not override format if neither text nor bitmap codec prop is set
...
Some decoders may output both, this way the decoder can set it.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 23:03:00 +02:00
Paul B Mahol
94ad38e2e8
dpx: use av_image_copy_plane()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:51:14 +00:00
Paul B Mahol
6a57494204
dpxenc: cosmetics: reindent
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:45:48 +00:00
Paul B Mahol
9d099b9ae4
targa_y216dec: remove empty function
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:27:15 +00:00
Paul B Mahol
0909f3edbd
zmbv: return meaningful error code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:21:33 +00:00
Paul B Mahol
60a7fac61b
utvideoenc: use av_image_copy_plane()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 20:07:48 +00:00
Tim.Nicholson
84e345b38e
Forward interlaced field information from mov to v210 decoder.
...
Reported and tested by Dave Rice.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-07-27 18:57:28 +02:00
Stefano Sabatini
b4bd21b7fe
doc/codecs: fix dangling reference to codec-options chapter
2013-07-27 16:50:19 +02:00
Diego Biurrun
270d7e3a18
doc: cosmetics: Consistently format list and table items
2013-07-27 16:24:55 +02:00
Diego Biurrun
bf4b0ed1d5
Add missing deprecation attributes
2013-07-27 16:08:49 +02:00
Diego Biurrun
5b097399ba
eval: Explicitly ignore return value of strtod() in parse_db()
...
The return value is not needed. This fixes the warning:
libavutil/eval.c:353:15: warning: ignoring return value of ‘strtod’
2013-07-27 16:00:41 +02:00
Diego Biurrun
6ff15cd569
Remove unreachable returns
2013-07-27 16:00:41 +02:00
Luca Barbato
c8f0b20b4a
avidec: Let the inner dv demuxer take care of discarding
...
CC: libav-stable@libav.org
2013-07-27 16:00:11 +02:00
Luca Barbato
10aa44aa67
avidec: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-07-27 16:00:11 +02:00
Diego Biurrun
37063714c0
build: Only check FATE dependencies when running FATE tests
...
Only check dependencies if invoking the make targets 'check'
or anything matching 'fate%' except 'fate-rsync'.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-27 16:50:21 +03:00
Michael Niedermayer
3adf054b22
avcodec/vorbisenc: change 6 asserts to av_asserts()
...
speed relevant ones use av_assert2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 15:23:13 +02:00
Michael Niedermayer
5e763920a4
avcodec/mpegvideo: update disabled assert() to av_assert0()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 15:23:13 +02:00
Paul B Mahol
88b071a473
exr: set pict_type
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:19 +00:00
Paul B Mahol
d9954ccff0
targa: set pict_type
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:18 +00:00
Paul B Mahol
3ea5d01a12
escape130: make "chroma_vals" static
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:18 +00:00
Paul B Mahol
6dbcecd78e
lclenc: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata
...
Also check return value.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:02:18 +00:00
Paul B Mahol
573018c61f
lclenc: cosmetics: reindent
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Paul B Mahol
86e722ab97
sgidec: safer check for buffer overflow
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Paul B Mahol
997e2b59e3
sgidec: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Paul B Mahol
5efa5103b0
sgidec: simplify return path
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-27 12:00:25 +00:00
Diego Biurrun
16c22122c7
h264: K&R formatting cosmetics
2013-07-27 10:47:38 +02:00
Diego Biurrun
966689442e
buffersink: K&R formatting cosmetics
2013-07-27 10:47:38 +02:00
Michael Niedermayer
e8023dbaf0
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wtv: Drop some casts that now are unnecessary
Conflicts:
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 09:43:29 +02:00
Michael Niedermayer
9027928522
Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253'
...
* commit '86f042dcabde2a5386dbd95ab0451b274987d253':
wtv: Make WTV_SECTOR_BITS a 64 bit constant
Conflicts:
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 09:19:58 +02:00
Michael Niedermayer
e64dc86a13
Merge commit '80ade7985cd95156e2156f50adc7b86d0e43a07a'
...
* commit '80ade7985cd95156e2156f50adc7b86d0e43a07a':
AIX: add support for shared builds
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 09:13:07 +02:00
Michael Niedermayer
103b8d876a
Merge commit 'b512360184ade835fba621f5042d643fc9e2ee9d'
...
* commit 'b512360184ade835fba621f5042d643fc9e2ee9d':
avio: Don't set the seekable flag if no seek function is provided
See: 650355089c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 09:06:21 +02:00
Michael Niedermayer
5cb3d35dcc
Merge commit '1297f7b87f8a84930a23eca705765c7c353dfcd5'
...
* commit '1297f7b87f8a84930a23eca705765c7c353dfcd5':
rtpenc: Fix some odd comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 08:58:26 +02:00
Michael Niedermayer
2fffc05f42
Merge commit '779e6c2b985f2ad461a1ae704160822f97709ba7'
...
* commit '779e6c2b985f2ad461a1ae704160822f97709ba7':
lavfi: add attribute_align_arg to all public entry points
Conflicts:
libavfilter/buffersink.c
See: af2a196e66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 08:53:09 +02:00
Michael Niedermayer
8720d3ac21
avfilter/vf_scale: set in_color_matrix default to "auto"
2013-07-27 01:16:07 +02:00
Michael Niedermayer
8efe96ee6f
swscale/fill_rgb2yuv_table: fix default detection
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27 01:11:37 +02:00
Michael Niedermayer
f3f4e133d6
avfilter/vf_scale: use sws_getCoefficients()
...
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 23:07:19 +02:00
Michael Niedermayer
205f423e28
libavcodec/mpegvideo: change some asserts to av_assert0()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 22:29:55 +02:00
Michael Niedermayer
c88bbc01eb
avcodec/mpegvideo: replace assert about interlaced EC by debug av_log()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 22:29:47 +02:00
Martin Storsjö
979e9e8f36
wtv: Drop some casts that now are unnecessary
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-26 23:05:18 +03:00
Martin Storsjö
86f042dcab
wtv: Make WTV_SECTOR_BITS a 64 bit constant
...
This makes sure that values that are left-shifted by this constant
end up casted to 64 bit before shifting, avoiding overflow if the
value ends up larger than 2 GB.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-26 23:05:14 +03:00
Michael Kostylev
80ade7985c
AIX: add support for shared builds
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-07-26 21:12:36 +02:00
Hendrik Schreiber
b512360184
avio: Don't set the seekable flag if no seek function is provided
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-26 21:46:18 +03:00
Martin Storsjö
1297f7b87f
rtpenc: Fix some odd comments
...
Some weird comments stem from the fact that the rtpdec and rtpenc
code was shared earlier.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-26 21:43:29 +03:00
Paul B Mahol
1fa0284c57
qcelpdec: change asserts to av_asserts
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 18:32:27 +00:00
Paul B Mahol
fdf9296df7
sgienc: remove unused SgiContext
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 18:21:44 +00:00
Paul B Mahol
be7d6710b4
lavfi/frei0r: use AV_OPT_TYPE_IMAGE_SIZE
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26 17:16:26 +00:00
Hendrik Leppkes
779e6c2b98
lavfi: add attribute_align_arg to all public entry points
...
Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.
Instead, add it to all public entry points to avoid these problems.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-26 19:51:04 +03:00