wm4
8c02adc62d
lavu: add all color-related enums to AVFrame
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-06-01 08:22:02 +02:00
Michael Niedermayer
ef1d4ee2f8
Merge commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834'
...
* commit 'bddd8cbf68551f6405b2bf77cc3e212af9fbe834':
Add transformation matrix API.
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19 19:12:30 +02:00
Vittorio Giovara
bddd8cbf68
Add transformation matrix API.
...
Add AV_PKT_DATA_DISPLAYMATRIX and AV_FRAME_DATA_DISPLAYMATRIX as stream and
frame side data (respectively) to describe a display transformation matrix
for linear transformation operations on the decoded video.
Add functions to easily extract a rotation angle from a matrix and
conversely to setup a matrix for a given rotation angle.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-05-19 13:13:10 +02:00
Michael Niedermayer
68c05185e2
Merge commit 'fd056029f45a9f6d213d9fce8165632042511d4f'
...
* commit 'fd056029f45a9f6d213d9fce8165632042511d4f':
lavc: add avcodec_free_context().
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18 13:00:50 +02:00
Anton Khirnov
fd056029f4
lavc: add avcodec_free_context().
...
Right now, the caller has to manually manage some allocated
AVCodecContext fields, like extradata or subtitle_header. This is
fragile and prone to leaks, especially if we want to add more such
fields in the future.
The only reason for this behaviour is so that the AVStream codec context
can be reused for decoding. Such reuse is discouraged anyway, so this
commit is the first step to deprecating it.
2014-05-18 10:17:41 +02:00
Michael Niedermayer
81d1fcf37d
avcodec: add option to make is_intra_more_likely() from error concealment return "no"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 22:55:39 +02:00
Michael Niedermayer
2ec4586d77
Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'
...
* commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8':
lavc: Add hwaccel private data and init/uninit callbacks
Conflicts:
libavcodec/avcodec.h
libavcodec/internal.h
libavcodec/pthread_frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 00:21:44 +02:00
Michael Niedermayer
c4fe50b954
Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'
...
* commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436':
hwaccel: Support specific frame allocators
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 00:06:35 +02:00
Michael Niedermayer
fa0f7c024e
Merge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'
...
* commit 'a871ef0cc936612bdb0e643196be72efcf0c8986':
hwaccel: Rename priv_data_size to frame_priv_data_size
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 23:49:13 +02:00
Michael Niedermayer
8d19dd91a5
Merge commit '08bb2567586599d62a282c4cd31567a0807f3d92'
...
* commit '08bb2567586599d62a282c4cd31567a0807f3d92':
lavc: document which parts of AVHWAccel are private.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 23:40:51 +02:00
Anton Khirnov
dd2d3b766b
lavc: Add hwaccel private data and init/uninit callbacks
2014-05-11 14:59:07 +02:00
Luca Barbato
ebc29519d1
hwaccel: Support specific frame allocators
...
It would reduce the boilerplate code users have to write.
2014-05-11 14:59:07 +02:00
Anton Khirnov
a871ef0cc9
hwaccel: Rename priv_data_size to frame_priv_data_size
...
This describes more accurately what this field is for.
2014-05-11 14:59:07 +02:00
Anton Khirnov
08bb256758
lavc: document which parts of AVHWAccel are private.
2014-05-11 14:59:07 +02:00
Michael Niedermayer
d7ade20adb
avcodec: add AV_EF_IGNORE_ERR
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04 13:24:40 +02:00
Michael Niedermayer
c60b266eac
avcodec/mpegvideo: support disabling motion compensation
...
This allows analyzing videos without having prior and current frames mixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-02 16:51:39 +02:00
Michael Niedermayer
58f4d1266b
Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275'
...
* commit 'ba71c74017c287681153ec8f6f1cba650d797275':
lavc: deprecate AVCodecContext.codec_name
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 18:04:53 +02:00
Michael Niedermayer
e77b9853ea
Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'
...
* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
lavc: move CODEC_FLAG_MV0 to mpegvideo
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 17:03:59 +02:00
Michael Niedermayer
e40ae8cc00
Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'
...
* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400':
lavc: make the xvid-specific "gmc" flag a private option of libxvid
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 16:56:40 +02:00
Michael Niedermayer
1851643987
Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'
...
* commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683':
lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 16:46:38 +02:00
Michael Niedermayer
cac07d0e10
Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'
...
* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd':
lavc: deprecate CODEC_FLAG_INPUT_PRESERVED
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 16:41:41 +02:00
Anton Khirnov
ba71c74017
lavc: deprecate AVCodecContext.codec_name
...
It is undocumented and has no real use.
2014-05-01 09:31:32 +02:00
Anton Khirnov
a2941c8cb2
lavc: move CODEC_FLAG_MV0 to mpegvideo
2014-05-01 09:24:18 +02:00
Anton Khirnov
6484149158
lavc: make the xvid-specific "gmc" flag a private option of libxvid
2014-05-01 09:24:02 +02:00
Anton Khirnov
b2c31710c9
lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo
2014-05-01 09:23:19 +02:00
Anton Khirnov
5fccedaa67
lavc: deprecate CODEC_FLAG_INPUT_PRESERVED
...
The addition of reference-counted frames makes it pointless.
2014-05-01 09:22:47 +02:00
Michael Niedermayer
617e866e25
Move av_find_best_pix_fmt_of_2() from avcodec to avutil
...
This avoids a dependancy of libavfilter on libavcodec
See Ticket 3592
Fixes Ticket2784
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 23:14:05 +02:00
Nicolas George
1bf6396498
lavc: add a mime_types field to codec descriptors.
2014-04-29 13:24:18 +02:00
Nicolas George
6ea1196673
lavc: add AV_CODEC_ID_BIN_DATA.
2014-04-29 13:24:18 +02:00
Michael Niedermayer
56efd98a65
Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'
...
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
On2 AVC decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-23 20:47:13 +02:00
Kostya Shishkov
e2834567d7
On2 AVC decoder
2014-04-23 19:57:44 +02:00
Reimar Döffinger
8cbf0827e1
Various small spelling fixes.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-04-22 20:44:31 +02:00
Michael Niedermayer
5e6be52bac
Merge commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9'
...
* commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9':
lavc: improve AVCodecContext.delay doxy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-22 13:34:43 +02:00
Anton Khirnov
b19a5e5198
lavc: improve AVCodecContext.delay doxy
2014-04-22 07:44:40 +02:00
Michael Niedermayer
0c67ef2729
Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'
...
* commit '86a0432688216562926d4aee36118f01be6d5e1b':
Silicon Graphics Motion Video Compressor 1 & 2 decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/mvcdec.c
libavcodec/version.h
See: 746b1dcc98
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 19:47:58 +02:00
Michael Niedermayer
e37dbfddda
Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'
...
* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
Silicon Graphics RLE 8-bit video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/sgirledec.c
libavcodec/version.h
See: afa1617b93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 19:26:46 +02:00
Peter Ross
86a0432688
Silicon Graphics Motion Video Compressor 1 & 2 decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19 16:24:26 +02:00
Peter Ross
07761294fc
Silicon Graphics RLE 8-bit video decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19 16:24:26 +02:00
Peter Ross
5f4f9ee99f
Direct Stream Digital (DSD) decoder
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-15 20:35:57 +02:00
Michael Niedermayer
787be6d074
Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89'
...
* commit '6f273093e54cba130f3ffde3d6433e74baa4ad89':
LucasArts SMUSH VIMA audio decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavcodec/vima.c
This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously
used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition
to the previously used name "vima"
These changes are needed for compatibility with the renamed codec in libav
See: b18357326c
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 23:14:23 +02:00
Michael Niedermayer
881f4e8d34
Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'
...
* commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2':
LucasArts SMUSH SANM video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/sanm.c
libavcodec/version.h
See: 69254f4628
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06 22:19:16 +02:00
Paul B Mahol
6f273093e5
LucasArts SMUSH VIMA audio decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06 16:41:39 +02:00
Paul B Mahol
a420ccd4f2
LucasArts SMUSH SANM video decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06 16:40:27 +02:00
Roman Fietze
5bb3f88255
avcodec.h, avpacket.c: use const AVPacket pointers in copy functions
...
Signed-off-by: Roman Fietze <roman.fietze@telemotive.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04 18:36:48 +02:00
Michael Niedermayer
fb61ed1e9f
Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'
...
* commit 'ac4b32df71bd932838043a4838b86d11e169707f':
On2 VP7 decoder
Conflicts:
Changelog
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/vp8dsp.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/arm/vp8dsp_init_armv6.c
libavcodec/arm/vp8dsp_init_neon.c
libavcodec/avcodec.h
libavcodec/h264pred.c
libavcodec/version.h
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
libavcodec/vp8dsp.h
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/vp8dsp_init.c
See: 89f2f5dbd7
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04 14:46:10 +02:00
Peter Ross
ac4b32df71
On2 VP7 decoder
...
Further performance improvements and security fixes by
Vittorio Giovara, Luca Barbato and Diego Biurrun.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-04-04 04:00:11 +02:00
Michael Niedermayer
95582b5ccc
Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'
...
* commit '38389058c3308758c6365abd0f6b45c5e62bb90b':
OpenEXR decoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/exr.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 03:16:56 +02:00
Jimmy Christensen
38389058c3
OpenEXR decoder
...
Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno,
Nicolas George, Paul B Mahol and Michael Niedermayer.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-01 01:13:09 +02:00
Michael Niedermayer
16ddc58bd7
Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'
...
* commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033':
PAF demuxer and decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/paf.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/paf.c
libavformat/version.h
See: 7de4a16508
, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 04:32:05 +01:00
Paul B Mahol
70daeacd6e
PAF demuxer and decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-27 23:34:47 +01:00
Michael Niedermayer
f392949f1a
Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'
...
* commit 'ae17878fb2ab100264226c84c58f5b95a703312f':
BRender PIX image decoder
Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
See: 492a5f835c
, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 21:09:17 +01:00
Aleksi Nurmi
ae17878fb2
BRender PIX image decoder
...
Further enhancements by Vittorio Giovara and Paul B Mahol.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-27 18:27:23 +01:00
Michael Niedermayer
12ab07be44
Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'
...
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b':
Alias PIX image encoder and decoder
Conflicts:
Changelog
libavcodec/allcodecs.c
libavcodec/version.h
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 01:10:28 +01:00
Vittorio Giovara
e50f5d3cf9
Alias PIX image encoder and decoder
2014-03-26 23:25:02 +01:00
Peter Ross
89f2f5dbd7
On2 VP7 decoder
...
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: BBB
previous patch reviewed by jason
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25 13:29:05 +01:00
Michael Niedermayer
83e8978798
Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'
...
* commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78':
Add replaygain side data type and code for parsing replaygain tags.
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 14:03:55 +01:00
Michael Niedermayer
bd34e26b27
Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'
...
* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619':
lavc: give a typedeffed name to the AVPacket.side_data struct
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 13:27:33 +01:00
Anton Khirnov
5a7e35dd23
Add replaygain side data type and code for parsing replaygain tags.
2014-03-24 06:07:51 +01:00
Anton Khirnov
0e2c3ee9a3
lavc: give a typedeffed name to the AVPacket.side_data struct
2014-03-24 06:07:50 +01:00
Michael Niedermayer
3fc2362aef
Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'
...
* commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143':
Remove all SPARC architecture optimizations
Conflicts:
Makefile
configure
libavcodec/sparc/dsputil_vis.c
libavcodec/sparc/dsputil_vis.h
libavcodec/sparc/hpeldsp_vis.c
libavcodec/sparc/simple_idct_vis.c
libavcodec/sparc/vis.h
libswscale/sparc/yuv2rgb_vis.c
libswscale/swscale_internal.h
If someone wants to maintain these (or other) SPARC optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 22:35:47 +01:00
Michael Niedermayer
7ac1e27f0f
Merge commit 'd6096a67422534918405abb46dafbbac4608cbc3'
...
* commit 'd6096a67422534918405abb46dafbbac4608cbc3':
Remove all SH4 architecture optimizations
Conflicts:
libavcodec/sh4/dsputil_sh4.c
libavcodec/sh4/dsputil_sh4.h
libavcodec/sh4/idct_sh4.c
libavcodec/sh4/sh4.h
If someone wants to maintain these (or other) SH4 optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13 22:06:01 +01:00
Diego Biurrun
b4dd424d96
Remove all SPARC architecture optimizations
...
SPARC is no longer being used in any multimedia-related fields and the
VIS optimizations only represent a maintenance burden.
2014-03-13 05:50:28 -07:00
Diego Biurrun
d6096a6742
Remove all SH4 architecture optimizations
...
SH4 has been end-of-lifed and no more test machines are available.
2014-03-13 05:50:28 -07:00
Michael Niedermayer
cbcfd7da4d
avcodec: support setting the chroma intra matrix
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-18 18:19:27 +01:00
Michael Niedermayer
f3bb5f28d3
Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'
...
* commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53':
doxygen: Add a number of missing function parameter descriptions
Conflicts:
libavformat/avformat.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-17 21:11:29 +01:00
Diego Biurrun
4d7ab5cfeb
doxygen: Add a number of missing function parameter descriptions
2014-02-17 15:36:09 +01:00
Michael Niedermayer
0c4bf87b29
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Mirillis FIC video decoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-08 19:02:46 +01:00
Kostya Shishkov
cde7df25ef
Mirillis FIC video decoder
...
Does not contain cursor rendering yet.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-02-08 15:04:13 +00:00
Michael Niedermayer
eef74b2e97
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
Conflicts:
doc/APIchanges
libavcodec/utils.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-20 18:55:22 +01:00
Anton Khirnov
93c553c71e
lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
2014-01-20 12:52:28 +01:00
Michael Niedermayer
0389f9abe9
avcodec/avcodec: document that some video decoders do not support linesizes changing between frames.
...
Omission in the documentation found by: Sebastian Dröge
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-03 15:35:11 +01:00
Anssi Hannula
4a4437c0fb
avformat/mpegts: demux timed ID3 metadata
...
Used in some HLS streams ("Timed Metadata for HTTP Live Streaming").
This is just ID3 tags at arbitrary stream positions, but I still added
"timed" to the codec name to avoid confusion with regular non-stream ID3
tags.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
2013-12-31 03:13:12 +02:00
Ivan Kalvachev
1c63aed232
Convert XvMC to hwaccel v3
...
Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-22 22:03:47 +01:00
Gildas Cocherel
2a41826bea
lavc: add HEVC profiles names
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-12-20 19:35:27 +01:00
Michael Niedermayer
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
Michael Niedermayer
409a143e4b
Merge commit '943135621830ac3857d3cf766cfc280a95bb3c13'
...
* commit '943135621830ac3857d3cf766cfc280a95bb3c13':
lavc: deprecate avcodec_free_frame()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-11 23:24:48 +01:00
Anton Khirnov
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
Anton Khirnov
9431356218
lavc: deprecate avcodec_free_frame()
...
av_frame_free() should be used instead.
2013-12-11 20:39:54 +01:00
gcocherel
fb7d70c1cd
hevc : add hevc profile
...
(cherry picked from commit 0c8dfd8ad6400b33da55a9f4d9aa8d3f5c9d209f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-22 01:29:02 +01:00
Ben Boeckel
51a84a6bca
avpacket: add pack/unpack functions for AVDictionary
...
These functions are intended for use with side_data which comes in an
AVPacket.
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 16:48:51 +01:00
Ben Boeckel
1e506a2cc5
avcodec: add side_data type for updated metadata
...
This type is intended to be used to allow codecs to pass updated
metadata to applications.
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-20 16:48:51 +01:00
Michael Niedermayer
066dbfe165
Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'
...
* commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da':
avcodec.h: include version.h before using version macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 18:19:06 +01:00
Vittorio Giovara
6f1ec8edf2
avcodec.h: include version.h before using version macro
2013-11-19 14:48:36 +01:00
Michael Niedermayer
29c83d23e8
Merge commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d'
...
* commit 'b9fb59d2ab05fdfe89d3fb0d7ecbbd91e560f57d':
lavc: deprecate avcodec_alloc_frame().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17 00:01:23 +01:00
Michael Niedermayer
571a99de18
Merge commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf'
...
* commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf':
lavc: update coded_frame doxy.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-16 23:42:18 +01:00
Michael Niedermayer
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
Anton Khirnov
b9fb59d2ab
lavc: deprecate avcodec_alloc_frame().
2013-11-16 12:44:50 +01:00
Anton Khirnov
2ff302cb6b
lavc: update coded_frame doxy.
...
It is not used during decoding anymore.
2013-11-16 12:41:50 +01:00
Anton Khirnov
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Anton Khirnov
cce3e0a49f
Move av_fast_{m,re}alloc from lavc to lavu.
2013-11-14 09:42:22 +01:00
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
b45c87083d
lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump
2013-11-14 09:40:27 +01:00
Anton Khirnov
8941971a8f
lavc: make error_rate a private option of mpegvideo encoders
2013-11-14 09:39:43 +01:00
Michael Niedermayer
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