Michael Niedermayer
0671dc5c53
avformat/asfdec_f: Improve packet resync heuristic
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 01:30:02 +02:00
Michael Niedermayer
5d79a07316
avformat/asfdec_f: Do not print errors if packets do not start with ECC
...
There is nothing wrong with such packets, the spec allows this
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 01:21:17 +02:00
Michael Niedermayer
385eb066ce
avformat/asfdec_f: Increase the amount of information provided in cases of errors
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22 01:08:34 +02:00
Luca Barbato
3ae0e721c7
checkasm: Always link statically
...
Checkasm needs to use internal symbols that should not be made public.
2015-07-21 23:22:42 +02:00
Vesselin Bontchev
323ec6b5e2
Add support for TEA (Tiny Encryption Algorithm)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 23:10:44 +02:00
Zhang Rui
830d3a0ebe
avformat/async: rename async_interrupt_callback to async_check_interrupt
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 21:19:05 +02:00
Zhang Rui
5e2098d906
avformat/async: fix interrupt_callback usage and return code
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 21:18:48 +02:00
Michael Niedermayer
8fe00dd18a
Merge commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc'
...
* commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc':
dds: Decode using optimal slices sizes
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 20:35:59 +02:00
Michael Niedermayer
2de5737ee2
Merge commit '977105407cae55876041dddbf4ce0934cdd4cd6c'
...
* commit '977105407cae55876041dddbf4ce0934cdd4cd6c':
hap: Decode using optimal slices sizes
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 20:21:54 +02:00
Bernd Bleßmann
d2b78fe6b7
libavfilter/vf_crop: implement process_command
...
Signed-off-by: Bernd Bleßmann <bb@it-entwicklung.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 19:19:36 +02:00
Bernd Bleßmann
99ad832c7e
libavfilter/vf_scale: implement process_command
...
Signed-off-by: Bernd Bleßmann <bb@it-entwicklung.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 18:20:22 +02:00
James Almer
d32547a24a
avcodec/utils: silence some deprecation warnings
...
And prevent eventual compilation failures once the relevant functions
and fields are removed.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-21 13:03:29 -03:00
James Almer
3e46c7dbbe
avcodec/options-test: don't alloc avctx->coded_frame
...
It's done automatically by avcodec_open2() now.
Fixes memleaks in fate-libavcodec-options.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-21 13:03:25 -03:00
周晓勇
c303ad85a9
avcodec: loongson optimize blockdsp with mmi
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 17:50:19 +02:00
Michael Niedermayer
39867f3e09
avfilter/af_channelmap: Move ff_add_channel_layout() call to querry_format()
...
Avoids memleak if querry_formats is not called
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 17:40:38 +02:00
Michael Niedermayer
f2d7409c72
avformat/async: Add missing else
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 17:04:11 +02:00
Michael Niedermayer
be0fd07457
Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'
...
* commit '219b39a71a5694b1c14a07b86477f665a5b6849b':
parseutil: Use non ambiguous aliases for uhd
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 16:55:39 +02:00
Michael Niedermayer
593731efa8
tests/checkasm/Makefile: Fix checkasm with SDL
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 15:55:05 +02:00
Zhang Rui
aee909acfb
fate: add test for async protocol
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 15:19:42 +02:00
Tom Butterworth
5d0616ce0e
avcodec/hapdec: log reason for failure when texture type doesn't match stream
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 14:54:25 +02:00
周晓勇
b50910e9a9
avcodec: loongson optimize xvid idct with mmi
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 14:48:23 +02:00
周晓勇
21e2f030bf
avcodec: loongson move simple idct functions to a separate file
...
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 14:48:18 +02:00
Rostislav Pehlivanov
331c1e7494
aacenc: move the generation of ff_aac_pow34sf_tab[]
...
This commit moves the generation of ff_aac_pow34sf_tab[] out of the
encoder and into the table generator. The original commit log for
this table in 2011 actually mentions that it should be moved outside
but this never happened.
This is the first commit which cleans up the encoder a little.
Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 13:53:04 +02:00
Luca Barbato
6b2b26e7af
dds: Decode using optimal slices sizes
...
Enjoy some cache locality and use less threads.
About the same speedup provided to HAP.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-21 12:14:25 +02:00
Luca Barbato
977105407c
hap: Decode using optimal slices sizes
...
Enjoy some cache locality and use less threads.
About 5x speedup (from 60ms to 12ms to decode a 4k frame).
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-21 12:14:25 +02:00
Luca Barbato
219b39a71a
parseutil: Use non ambiguous aliases for uhd
...
uhd1 and uhd2 would be ambigous.
2015-07-21 11:43:44 +02:00
Zhang Rui
cee7acfcfc
MAINTAINERS: add myself as a maintainer for async protocol
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 10:40:31 +02:00
Tom Butterworth
6b96c70f2d
avcodec/hapdec: don't log texture format every frame, do it once per decode session
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 03:25:01 +02:00
Tom Butterworth
440c26e9c4
libavcodec/hap: remove unused struct member
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 03:15:04 +02:00
Tom Butterworth
d8488090e5
libavcodec/hap: Name enums
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 03:14:53 +02:00
James Almer
651448a8a7
avcodec/aacsbr: fix compilation with hardcoded tables
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-20 21:01:19 -03:00
Michael Niedermayer
eca84946ea
Merge commit '9ed6f9a17cc1f7d3699a1223783dadc1ee222069'
...
* commit '9ed6f9a17cc1f7d3699a1223783dadc1ee222069':
arm: use a local label instead of the function symbol in ff_prefetch_arm
See: cab6302534
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 01:49:21 +02:00
Michael Niedermayer
5d5f8b29b4
Merge commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68'
...
* commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68':
h264: aarch64: intra prediction optimisations
Conflicts:
libavcodec/h264pred.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 01:39:30 +02:00
Michael Niedermayer
495eee0123
Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'
...
* commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370':
Deprecate avctx.coded_frame
Conflicts:
ffmpeg.c
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/gif.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/proresenc_kostya.c
libavcodec/pthread_frame.c
libavcodec/rawenc.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/version.h
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 01:17:15 +02:00
Michael Niedermayer
809780ca42
avcodec/utils: Do not merge side data for encoders
...
With side data now being added to every MPEG*/H26* video encoder
in the form of a quality scalar, software which simply stores
the pkt->data to get an ES stream would break.
This also as a side-effect makes the code faster
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 00:54:59 +02:00
Michael Niedermayer
e5bae39f46
Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'
...
* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b':
Add a quality factor packet side data
Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/avcodec.h
libavcodec/mpegvideo_enc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 00:54:42 +02:00
Michael Niedermayer
b1fad7ac20
Merge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'
...
* commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534':
Gather all coded_frame allocations and free functions to a single place
Conflicts:
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/dvenc.c
libavcodec/gif.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libopenjpegenc.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/v210enc.c
libavcodec/v410enc.c
libavcodec/xbmenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 23:43:05 +02:00
Janne Grunau
9ed6f9a17c
arm: use a local label instead of the function symbol in ff_prefetch_arm
...
Avoids a relocation which might end out of range for thumb2.
Reported-By: Ludovic Fauvet <etix@videolan.org>
Bug-Id: https://bugs.webkit.org/show_bug.cgi?id=137022
CC: libav-stable@libav.org
2015-07-20 23:10:29 +02:00
Janne Grunau
f56d8d8dd7
h264: aarch64: intra prediction optimisations
2015-07-20 23:10:29 +02:00
Michael Niedermayer
439c9760b0
Merge commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf'
...
* commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf':
flashsvenc: Keep coded_frame.key_frame a write-only variable
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:36:22 +02:00
Michael Niedermayer
5cc3faf619
Merge commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b'
...
* commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b':
ffv1enc: Use input frame to set SAR and interlacing
Conflicts:
libavcodec/ffv1enc.c
No change as the removed coded_frame uses where not in the code anymore
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:35:38 +02:00
Michael Niedermayer
b97e3e11a9
Merge commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e'
...
* commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e':
ffv1enc: Keep coded_frame.key_frame a write-only variable
Conflicts:
libavcodec/ffv1.h
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:25:53 +02:00
Michael Niedermayer
256430cf38
Merge commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162'
...
* commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162':
qtrleenc: Keep coded_frame.key_frame a write-only variable
Conflicts:
libavcodec/qtrleenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:14:29 +02:00
Michael Niedermayer
bde7f5b135
Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'
...
* commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f':
libtheoraenc: Keep coded_frame.key_frame a write-only variable
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:13:42 +02:00
Michael Niedermayer
96504b3f72
Merge commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b'
...
* commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b':
libvpxenc: Do not entangle coded_frame
Conflicts:
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:05:27 +02:00
Michael Niedermayer
70c648db89
Merge commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e'
...
* commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e':
libxvid: Do not entangle coded_frame
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 22:01:44 +02:00
Michael Niedermayer
033144c0d1
Merge commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919'
...
* commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919':
svq1enc: Do not entangle coded_frame
Conflicts:
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 21:53:09 +02:00
Michael Niedermayer
f2a581e2ee
Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'
...
* commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024':
proresenc: Do not entangle coded_frame
Conflicts:
libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 21:44:53 +02:00
Michael Niedermayer
a99f0ad194
Merge commit '91767360d86ac786571593ab11c7291010ab3829'
...
* commit '91767360d86ac786571593ab11c7291010ab3829':
a64multienc: Do not entangle coded_frame
Conflicts:
libavcodec/a64multienc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 21:40:34 +02:00
Michael Niedermayer
6497aab022
Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'
...
* commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e':
roqvideoenc: Drop unneeded initialization
Conflicts:
libavcodec/roqvideoenc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 21:31:42 +02:00