virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'c5fca0174db9ed45be821177f49bd9633152704d'

Browse Source 
* commit 'c5fca0174db9ed45be821177f49bd9633152704d':
  lavc: add a property for marking codecs that support frame reordering

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-28 12:36:28 +02:00
commit 2e5c8b0649
4 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -15,6 +15,9 @@ libavutil: 2012-10-22
API changes, most recent first: API changes, most recent first:
2014-xx-xx - xxxxxxx - lavc 55.57.0 - avcodec.h
Add AV_CODEC_PROP_REORDER to mark codecs supporting frame reordering.
2014-07-27 - XXXXXXX - lavc 55.70.100 - avdct.h 2014-07-27 - XXXXXXX - lavc 55.70.100 - avdct.h
Add AVDCT / avcodec_dct_alloc() / avcodec_dct_init(). Add AVDCT / avcodec_dct_alloc() / avcodec_dct_init().

10
libavcodec/avcodec.h
View File

@ -595,6 +595,16 @@ typedef struct AVCodecDescriptor {
* Codec supports lossless compression. Audio and video codecs only. * Codec supports lossless compression. Audio and video codecs only.
*/ */
#define AV_CODEC_PROP_LOSSLESS (1 << 2) #define AV_CODEC_PROP_LOSSLESS (1 << 2)
/**
* Codec supports frame reordering. That is, the coded order (the order in which
* the encoded packets are output by the encoders / stored / input to the
* decoders) may be different from the presentation order of the corresponding
* frames.
*
* For codecs that do not have this property set, PTS and DTS should always be
* equal.
*/
#define AV_CODEC_PROP_REORDER (1 << 3)
/** /**
* Subtitle codec is bitmap based * Subtitle codec is bitmap based
* Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field. * Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field.

32
libavcodec/codec_desc.c
View File

@ -35,14 +35,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "mpeg1video", .name = "mpeg1video",
.long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"), .long_name = NULL_IF_CONFIG_SMALL("MPEG-1 video"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_MPEG2VIDEO, .id = AV_CODEC_ID_MPEG2VIDEO,
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "mpeg2video", .name = "mpeg2video",
.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
#if FF_API_XVMC #if FF_API_XVMC
{ {
@ -65,7 +65,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "h263", .name = "h263",
.long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"), .long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996, H.263+ / H.263-1998 / H.263 version 2"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_RV10, .id = AV_CODEC_ID_RV10,
@ -79,7 +79,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "rv20", .name = "rv20",
.long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"), .long_name = NULL_IF_CONFIG_SMALL("RealVideo 2.0"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_MJPEG, .id = AV_CODEC_ID_MJPEG,
@ -101,7 +101,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "mpeg4", .name = "mpeg4",
.long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_RAWVIDEO, .id = AV_CODEC_ID_RAWVIDEO,
@ -150,14 +150,14 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "h263p", .name = "h263p",
.long_name = NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"), .long_name = NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_H263I, .id = AV_CODEC_ID_H263I,
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "h263i", .name = "h263i",
.long_name = NULL_IF_CONFIG_SMALL("Intel H.263"), .long_name = NULL_IF_CONFIG_SMALL("Intel H.263"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_FLV1, .id = AV_CODEC_ID_FLV1,
@ -178,7 +178,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "svq3", .name = "svq3",
.long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"), .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 3 / Sorenson Video 3 / SVQ3"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_DVVIDEO, .id = AV_CODEC_ID_DVVIDEO,
@ -206,7 +206,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "h264", .name = "h264",
.long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"), .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
.props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_INDEO3, .id = AV_CODEC_ID_INDEO3,
@ -458,28 +458,28 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "rv30", .name = "rv30",
.long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"), .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_RV40, .id = AV_CODEC_ID_RV40,
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "rv40", .name = "rv40",
.long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"), .long_name = NULL_IF_CONFIG_SMALL("RealVideo 4.0"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_VC1, .id = AV_CODEC_ID_VC1,
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "vc1", .name = "vc1",
.long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"), .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_WMV3, .id = AV_CODEC_ID_WMV3,
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "wmv3", .name = "wmv3",
.long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"), .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_LOCO, .id = AV_CODEC_ID_LOCO,
@ -592,7 +592,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "cavs", .name = "cavs",
.long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"), .long_name = NULL_IF_CONFIG_SMALL("Chinese AVS (Audio Video Standard) (AVS1-P2, JiZhun profile)"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_JPEG2000, .id = AV_CODEC_ID_JPEG2000,
@ -741,7 +741,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "dirac", .name = "dirac",
.long_name = NULL_IF_CONFIG_SMALL("Dirac"), .long_name = NULL_IF_CONFIG_SMALL("Dirac"),
.props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_BFI, .id = AV_CODEC_ID_BFI,
@ -1201,7 +1201,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.name = "hevc", .name = "hevc",
.long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC (High Efficiency Video Coding)"), .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC (High Efficiency Video Coding)"),
.props = AV_CODEC_PROP_LOSSY, .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER,
}, },
{ {
.id = AV_CODEC_ID_FIC, .id = AV_CODEC_ID_FIC,

2
libavcodec/version.h
View File

@ -29,7 +29,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 70 #define LIBAVCODEC_VERSION_MINOR 71
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \