2e1fb96af3
ATRAC+ decoder
...
Cleanup by Diego Biurrun.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-29 01:11:16 +01:00
25b243759c
Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'
...
* commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0':
avutil: Move library version related macros to version.h
Conflicts:
libavcodec/version.h
libavresample/version.h
libavutil/avutil.h
libavutil/utils.c
See: 183117fed7michaelni@gmx.at >
2013-12-27 12:01:23 +01:00
b83d1ee3b4
avutil: Move library version related macros to version.h
...
This is a more sensible place for these macros.
2013-12-26 19:05:22 +01:00
6fe5f770db
Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'
...
* commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b':
Add a libwebp encoder
Conflicts:
Changelog
doc/encoders.texi
doc/general.texi
libavcodec/version.h
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-22 11:53:41 +01:00
be7c323176
Add a libwebp encoder
2013-12-21 17:01:42 -05:00
d6b7ea06f1
Merge commit '2a41826bea3833895dc06939831b7f35ca1f597e'
...
* commit '2a41826bea3833895dc06939831b7f35ca1f597e':
lavc: add HEVC profiles names
Conflicts:
libavcodec/hevc.c
libavcodec/version.h
See: fb7d70c1cdmichaelni@gmx.at >
2013-12-21 00:24:43 +01:00
2a41826bea
lavc: add HEVC profiles names
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2013-12-20 19:35:27 +01:00
47cc616864
Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'
...
* commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c':
png: add a standalone parser
Conflicts:
Changelog
libavcodec/png_parser.c
libavcodec/version.h
See: 2ee6dca3b8michaelni@gmx.at >
2013-12-17 17:58:53 +01:00
6fd99e78de
png: add a standalone parser
...
Useful for reading png images from a pipe.
2013-12-17 09:34:08 +01:00
44967ab60a
Merge commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671'
...
* commit 'd7b3ee9a3a03ab88d61a5895fbdbc6689f4dd671':
lavc: deprecate avcodec_get_frame_defaults().
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-12 00:32:15 +01:00
d7b3ee9a3a
lavc: deprecate avcodec_get_frame_defaults().
...
Also bump libavcodec micro and add an APIchanges entry saying that
av_frame_* should now be used instead of the lavc AVFrame functions.
2013-12-11 20:39:55 +01:00
04e06cdf7d
avcodec: split mp2 encoder into float and fixed
...
This makes the USE_FLOATS == 0 available to the end user
More float optimizations can easily be added as well now
common code should be factored out into a common file once all
fixed point & floating point optimizations are done, this is to
avoid having to move code back and forth between files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-03 21:12:00 +01:00
c28b61caf0
Document new APIs for av_packet_{un, }pack_dictionary()
...
Signed-off-by: Ben Boeckel <mathstuf@gmail.com >
Reveiwed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-20 17:03:19 +01:00
c3814ab654
rename new lls code to lls2 to avoid conflict with the old which has a different ABI
...
also remove failed attempt at a compatibility layer, the code simply cannot work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-17 16:41:08 +01:00
ec9aef5652
Merge commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4'
...
* commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4':
lavc: deprecate CODEC_CAP_NEG_LINESIZES
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-16 23:36:33 +01:00
b068660ffa
lavc: deprecate CODEC_CAP_NEG_LINESIZES
...
It was never used in any codec since it was added 3 years ago.
2013-11-16 12:41:40 +01:00
72ca830f51
lavc: VP9 decoder
...
Originally written by Ronald S. Bultje <rsbultje@gmail.com > and
Clément Bœsch <u@pkh.me >
Further contributions by:
Anton Khirnov <anton@khirnov.net >
Diego Biurrun <diego@biurrun.de >
Luca Barbato <lu_zero@gentoo.org >
Martin Storsjö <martin@martin.st >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2013-11-15 10:16:28 +01:00
7c888ae746
Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'
...
* commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4':
Move av_fast_{m,re}alloc from lavc to lavu.
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavutil/mem.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-14 15:04:04 +01:00
9f32048dd1
Merge commit 'aa241229891173b0357eee04e6ca78f806cc9c0c'
...
* commit 'aa241229891173b0357eee04e6ca78f806cc9c0c':
lavc: deprecate FF_MAX_B_FRAMES
Conflicts:
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-14 14:11:03 +01:00
dbfa4317f3
Merge commit 'b6094811f9fca66cdf853420696e96fdc3e4987a'
...
* commit 'b6094811f9fca66cdf853420696e96fdc3e4987a':
lavc: move MB_TYPE_* macros from avcodec.h to mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-14 14:01:24 +01:00
d67d3e2977
Merge commit 'b45c87083de67969c1598cfef41e7c947b137922'
...
* commit 'b45c87083de67969c1598cfef41e7c947b137922':
lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-14 13:49:02 +01:00
b71e4d8717
Merge commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65'
...
* commit '8941971a8f2e24b9a84fe29f128d13ceb89c0a65':
lavc: make error_rate a private option of mpegvideo encoders
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-14 13:14:41 +01:00
5f231d909f
Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118'
...
* commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118':
vdpau: add a convenience function for getting a decoder profile.
Conflicts:
doc/APIchanges
libavcodec/vdpau.c
libavcodec/vdpau.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-14 13:00:10 +01:00
cce3e0a49f
Move av_fast_{m,re}alloc from lavc to lavu.
2013-11-14 09:42:22 +01:00
aa24122989
lavc: deprecate FF_MAX_B_FRAMES
...
We should not arbitrarily decide the maximum B-frame number for all
encoders supported by Libav, each encoder should be able to set its own
limits.
2013-11-14 09:41:03 +01:00
b6094811f9
lavc: move MB_TYPE_* macros from avcodec.h to mpegvideo.h
...
They are mpegvideo-specific and not supposed to be used by callers.
2013-11-14 09:40:39 +01:00
b45c87083d
lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump
2013-11-14 09:40:27 +01:00
8941971a8f
lavc: make error_rate a private option of mpegvideo encoders
2013-11-14 09:39:43 +01:00
ca22d1dea2
vdpau: add a convenience function for getting a decoder profile.
...
Based on the code by Rémi Denis-Courmont <remi@remlab.net > from VLC.
2013-11-14 09:38:50 +01:00
5231eecdaf
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Deprecate obsolete XvMC hardware decoding support
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12dec.c
libavcodec/mpegvideo.c
libavcodec/options_table.h
libavutil/pixdesc.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-14 03:26:35 +01:00
e25ed2608c
Merge commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac'
...
* commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac':
Remove all Alpha architecture optimizations
Conflicts:
libavcodec/alpha/asm.h
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/dsputil_alpha.h
libavcodec/alpha/dsputil_alpha_asm.S
libavcodec/alpha/hpeldsp_alpha.c
libavcodec/alpha/hpeldsp_alpha.h
libavcodec/alpha/hpeldsp_alpha_asm.S
libavcodec/alpha/motion_est_alpha.c
libavcodec/alpha/motion_est_mvi_asm.S
libavcodec/alpha/mpegvideo_alpha.c
libavcodec/alpha/regdef.h
libavcodec/alpha/simple_idct_alpha.c
We have a qemu based fate alpha client. And various failures
on alpha have previously pointed to issues in generic C code.
Thus IMHO it makes sense to keep alpha code as long as someone
is willing to do the little bit of maintaince it needs
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-14 02:55:42 +01:00
19e30a58fc
Deprecate obsolete XvMC hardware decoding support
...
XvMC has long ago been superseded by newer acceleration APIs, such as
VDPAU, and few downstreams still support it. Furthermore XvMC is not
implemented within the hwaccel framework, but requires its own specific
code in the MPEG-1/2 decoder, which is a maintenance burden.
2013-11-13 21:07:45 +01:00
c7f7bfc9e3
Remove all Alpha architecture optimizations
...
Alpha has been end-of-lifed and no more test machines are available.
2013-11-13 20:45:49 +01:00
fe55c31976
lavc/elbg: rename ff_ symbols to avpriv_, so they can be used in shared libs
...
In particular, allows the use of elbg in other FFmpeg libraries, required
by the pending elbg filter.
2013-11-13 11:21:46 +01:00
be41f21a3d
Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212'
...
* commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212':
lavc: Add colorimetry values for BT.2020, other non-included ones
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-04 21:26:34 +01:00
cd8f772d06
lavc: Add colorimetry values for BT.2020, other non-included ones
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2013-11-04 15:39:33 +01:00
ab71be0912
Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'
...
* commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9':
lavc: move AVCodecContext.pkt to AVCodecInternal
Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-04 11:41:55 +01:00
3fc26d8073
Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12'
...
* commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12':
pthread: store thread contexts in AVCodecInternal instead of AVCodecContext
Conflicts:
libavcodec/internal.h
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-04 11:14:38 +01:00
da6506c607
lavc: move AVCodecContext.pkt to AVCodecInternal
...
It's a private field, not meant to be accessed from outside lavc.
2013-11-04 08:51:26 +01:00
38ecc3702d
pthread: store thread contexts in AVCodecInternal instead of AVCodecContext
...
It's a private field, it should not be visible to callers.
Deprecate AVCodecContext.thread_opaque
2013-11-04 08:51:26 +01:00
cfe7185a92
lavc: remove dead FF_API_OLD_TIMECODE API
2013-11-03 17:58:44 +01:00
a689560428
lavc: remove dead FF_API_AVCODEC_OPEN API
2013-11-03 17:58:44 +01:00
d3397c3e82
lavc: remove dead FF_API_ALLOC_CONTEXT API
2013-11-03 17:58:44 +01:00
90c329cc25
lavc/version.h: remove empty line
2013-11-03 13:13:24 +01:00
5a6e6dcaa4
lavc: drop deprecated audio_convert API at the next major bump
...
Also make AVCODEC_RESAMPLE API removal depends on its presence, since its
code depends on it as well.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com >
2013-11-03 13:13:24 +01:00
382545ae62
Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'
...
* commit '28240a60c1b5ce276e947ba013271ec009adc078':
lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-01 19:20:02 +01:00
935d0ee08d
Merge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3'
...
* commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3':
lavc: deprecate unused FF_BUG_OLD_MSMPEG4
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-01 19:12:13 +01:00
7592d30bcb
Merge commit '0300962b76644f145b773439989a5cdf1667e162'
...
* commit '0300962b76644f145b773439989a5cdf1667e162':
lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-01 19:03:19 +01:00
c6c03dfdf1
Merge commit 'ccc71298456d97f64f539e303c771d04dcb33c53'
...
* commit 'ccc71298456d97f64f539e303c771d04dcb33c53':
lavc: deprecate FF_DEBUG_MV and remove all traces of its use
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-01 18:22:42 +01:00
5eb1704d5f
Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'
...
* commit '064698d381e1e7790f21b0199a8930ea04e2e942':
Add HEVC decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_cabac.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
libavcodec/hevc_parser.c
libavcodec/hevc_ps.c
libavcodec/hevc_refs.c
libavcodec/hevc_sei.c
libavcodec/hevcdsp.c
libavcodec/hevcdsp_template.c
libavcodec/hevcpred.c
libavcodec/hevcpred_template.c
libavcodec/version.h
cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-11-01 17:13:00 +01:00
Maxim Poliakovski