diff options
| author | Sascha Sommer <saschasommer@freenet.de> | 2009-09-16 15:08:26 +0000 |
|---|---|---|
| committer | Sascha Sommer <saschasommer@freenet.de> | 2009-09-16 15:08:26 +0000 |
| commit | d859bb1db0b082644881058a12653e3207855678 (patch) | |
| tree | f1472353e4ff258de5862f06c1b4ddf38019845a /libavcodec | |
| parent | 9d66ef18fa5504b073067691ed906bc15cfc9c87 (diff) | |
| download | ffmpeg-d859bb1db0b082644881058a12653e3207855678.tar.gz | |
Add CODEC_CAP_SUBFRAMES for codecs that output multiple subframes
per AVPacket
No longer print "Multiple frames in a packet" error message
when CODEC_CAP_SUBFRAMES is set (wmapro, wavpack)
Originally committed as revision 19881 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/wavpack.c | 1 | ||||
| -rw-r--r-- | libavcodec/wmaprodec.c | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fe1e060007..3909b66d7a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -605,6 +605,10 @@ typedef struct RcOverride{ * Codec can export data for HW decoding (VDPAU). */ #define CODEC_CAP_HWACCEL_VDPAU 0x0080 +/** + * Codec can output multiple frames per AVPacket + */ +#define CODEC_CAP_SUBFRAMES 0x0100 //The following defines may change, don't expect compatibility if you use them. #define MB_TYPE_INTRA4x4 0x0001 diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index 10254f08de..95f1d7123b 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -964,5 +964,6 @@ AVCodec wavpack_decoder = { NULL, NULL, wavpack_decode_frame, + .capabilities = CODEC_CAP_SUBFRAMES, .long_name = NULL_IF_CONFIG_SMALL("WavPack"), }; diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 2a45312ec0..7e7d233b79 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -1557,6 +1557,7 @@ AVCodec wmapro_decoder = { NULL, decode_end, decode_packet, + .capabilities = CODEC_CAP_SUBFRAMES, .flush= flush, .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 9 Professional"), }; |