Michael Niedermayer
cfe33c98b7
Merge commit ' 1fc64e2e07'
...
* commit '1fc64e2e07
2015-03-01 01:01:01 +01:00
Michael Niedermayer
ba069e08bd
Merge commit ' 0662440b99'
...
* commit '0662440b99
2015-03-01 01:00:44 +01:00
Michael Niedermayer
6f0a82966d
Merge commit ' 12b3459979'
...
* commit '12b3459979
2015-03-01 00:48:28 +01:00
Michael Niedermayer
f6f1e1a7a1
Merge commit ' 9856395344'
...
* commit '9856395344
2015-03-01 00:48:04 +01:00
Michael Niedermayer
e73b3dba3e
Merge commit ' 990e4a6639'
...
* commit '990e4a6639
2015-03-01 00:30:20 +01:00
Michael Niedermayer
2ab3088dda
Merge commit ' ea1d0b7ece'
...
* commit 'ea1d0b7ece732c3ebffa
2015-03-01 00:18:38 +01:00
Michael Niedermayer
8a77672645
Merge commit ' 802987f8c7'
...
* commit '802987f8c7
2015-03-01 00:17:36 +01:00
Michael Niedermayer
7fce8c752d
Merge commit ' 71f1ad37d8'
...
* commit '71f1ad37d8
2015-03-01 00:06:42 +01:00
Michael Niedermayer
5c17377e28
Merge commit ' d74a8cb7e4'
...
* commit 'd74a8cb7e4
2015-02-28 23:58:29 +01:00
Michael Niedermayer
e82b0e6126
Merge commit ' ee964145b5'
...
* commit 'ee964145b5
2015-02-28 23:41:36 +01:00
Michael Niedermayer
ca6fee7606
Merge commit ' b9d2d6843a'
...
* commit 'b9d2d6843a
2015-02-28 23:32:33 +01:00
Michael Niedermayer
c5c4e5839a
Merge commit ' e14f98c62f'
...
* commit 'e14f98c62f
2015-02-28 23:20:39 +01:00
Michael Niedermayer
1fb3642317
Merge commit ' c86d8aed74'
...
* commit 'c86d8aed74
2015-02-28 23:02:42 +01:00
Andreas Cadhalpun
e8565d21c2
avformat/flvenc: check that the codec_tag fits in the available bits
...
flags is later written with avio_w8 and if it doesn't fit in one byte it
triggers an av_assert2.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 22:53:12 +01:00
Andreas Cadhalpun
732c3ebffa
avcodec/utils: use correct printf specifier in ff_set_sar
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 22:40:40 +01:00
Michael Niedermayer
5705dc5276
avutil/imgutils: correctly check for negative SAR components
...
These could trigger assert failures previously
Found-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 21:57:11 +01:00
Martin Storsjö
1fc64e2e07
rtpenc: Write conditional statements on separate lines
...
Intentionally keeping some conditional statements on single lines
in rtpenc_h263.c.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-28 22:53:51 +02:00
Martin Storsjö
0662440b99
rtpenc_aac: Set a default value for max_frames_per_packet at init
...
This avoids having to conditionally set the default within the
packetizer function.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-28 22:53:46 +02:00
Martin Storsjö
12b3459979
rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf
...
This doesn't fix any bug, but makes the code simpler for later
patches, and more straightforward to read as is.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-28 22:53:42 +02:00
Martin Storsjö
9856395344
rtpenc_aac: Fix sending fragmented frames
...
After sending a fragmented frame, len (s->buf_ptr - s->buf) isn't
zero, while s->num_frames is zero as intended. Using s->num_frames
makes it work as intended, and is less convoluted than keeping track
of (resetting) s->buf_ptr.
This avoids sending stray data after sending a fragmented aac packet.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-28 22:53:38 +02:00
Anton Khirnov
990e4a6639
Add a QSV decoding example.
2015-02-28 21:51:24 +01:00
Andreas Cadhalpun
ea1d0b7ece
avcodec/utils: use correct printf specifier in ff_set_sar
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-02-28 21:51:24 +01:00
Christian Hujer
802987f8c7
x11grab: Unbreak building
...
The correct macro is DEC not D. Broken in
b31328d008
2015-02-28 21:51:24 +01:00
Anton Khirnov
71f1ad37d8
lavc: do not compile fmtconvert unconditionally
...
Only ac3dec and dcadec use it.
2015-02-28 21:51:24 +01:00
Anton Khirnov
d74a8cb7e4
fmtconvert: drop unused functions
2015-02-28 21:51:24 +01:00
Anton Khirnov
ee964145b5
lavc: remove unused traces of fmtconvert usage
...
Those decoders have been switched to float output and so do not use
fmtconvert anymore.
2015-02-28 21:51:24 +01:00
Martin Storsjö
b9d2d6843a
tls: Pass AVOptions dictionaries through to the chained protocol
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-28 22:08:19 +02:00
Martin Storsjö
e14f98c62f
tcp: Clarify the units for the timeout avoptions
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-28 22:07:24 +02:00
Martin Storsjö
c86d8aed74
avio: Rename avclass symbols relating to avio
...
Don't prefix them ffio_url, which is misleading, sounding too
much like the urlprotocol layer (like ffurl_*).
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-28 22:07:04 +02:00
Michael Niedermayer
5f1ea0bfc5
avcodec/ppc/fdctdsp: fix const warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 18:40:42 +01:00
zhaoxiu.zeng
94f5ac93d7
avcodec/vc1_block: Optimize vc1_decode_i_block_adv()
...
9127 -> 8936 decicycles (fate-suite/vc1/SA10143.vc1)
13855 -> 10976 decicycles (fate-suite/vc1/SA20021.vc1)
tests done by the author over this function but with the whole
patchset applied not just this commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 17:06:10 +01:00
zhaoxiu.zeng
21581182ca
avcodec/vc1_block: Optimize vc1_decode_i_block()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 17:00:04 +01:00
zhaoxiu.zeng
80a0daa0f6
avcodec/vc1_block: cosmetics
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 15:51:35 +01:00
zhaoxiu.zeng
137fbab11b
avcodec/vc1_block: move early exit code up in ff_vc1_pred_dc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 15:51:17 +01:00
zhaoxiu.zeng
9914502264
avcodec/vc1_block: Use av_clip_uintp2()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 15:29:51 +01:00
zhaoxiu.zeng
ec908ce427
avcodec/vc1_block: Optimize vc1_decode_ac_coeff()
...
Avoid branches in sign handling
Move local variables to where they are used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 15:25:03 +01:00
zhaoxiu.zeng
ccad34e3ca
avcodec/vc1_block: Simplify dcdiff initialization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 15:14:36 +01:00
zhaoxiu.zeng
bd55f01c96
avcodec/vc1_block: Simplify dir_ptr / pred initialization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 15:09:57 +01:00
zhaoxiu.zeng
f6b195cfb9
avcodec/vc1: Simplify pred/mc loops
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 14:57:46 +01:00
zhaoxiu.zeng
d8e030c3cc
avcodec/vc1: Simplify dmv_y initialization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 14:52:57 +01:00
zhaoxiu.zeng
751883c602
avcodec/vc1: Simplify code setting and using extend_x/y
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 14:42:15 +01:00
zhaoxiu.zeng
71de5542bb
avcodec/vc1: Make init_block_index() inline
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 14:36:07 +01:00
zhaoxiu.zeng
e2edb10f8e
avcodec/vc1: use uint8_t for size_table
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 14:32:27 +01:00
zhaoxiu.zeng
53cb0babb4
avcodec/vc1: simplify offset table and access
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 14:31:40 +01:00
Michael Niedermayer
5ee3a40f1c
ffmpeg: Fix -vstats when coded_frame is not set
...
There are several encoders which do not set coded_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 12:33:44 +01:00
Niklas Haas
888a33c070
lavc/pngenc: Support writing colorspace tags.
...
These are defined in http://www.w3.org/TR/PNG/#11addnlcolinfo .
2015-02-28 03:34:57 +01:00
Michael Niedermayer
0a23129bfc
avformat: Add prefix to get_codec_guid()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-27 19:25:27 +01:00
Michael Niedermayer
ae20682f6b
swscale: Add prefix to updateMMXDitherTables()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-27 19:23:46 +01:00
Michael Niedermayer
4d00860ac7
swresample: Add prefix to soxr_resampler
...
also move declaration to header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-27 19:20:43 +01:00
Michael Niedermayer
bf6102044d
avcodec/dvdec: Make dv_iweight_720_c static
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-27 19:17:23 +01:00
