diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 13:25:25 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 13:26:17 +0200 |
| commit | 037b44a3b44ead1cef8910c52fdd1343779b5203 (patch) | |
| tree | 7ea63198858ef5c7ec085c4341f2f97edb5767f5 /libavcodec/codec_desc.c | |
| parent | d59bfcd11229300182c672ca734568919a85f773 (diff) | |
| parent | 00332e0a064dad866812de9162b009cbaba6f5df (diff) | |
| download | ffmpeg-streaming-037b44a3b44ead1cef8910c52fdd1343779b5203.zip ffmpeg-streaming-037b44a3b44ead1cef8910c52fdd1343779b5203.tar.gz | |
Merge commit '00332e0a064dad866812de9162b009cbaba6f5df'
* commit '00332e0a064dad866812de9162b009cbaba6f5df':
wrapped_avframe: Initial implementation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 6076c41..0817f0c 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1266,6 +1266,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Screenpresso"), .props = AV_CODEC_PROP_LOSSLESS, }, + { + .id = AV_CODEC_ID_WRAPPED_AVFRAME, + .type = AVMEDIA_TYPE_VIDEO, + .name = "wrapped_avframe", + .long_name = NULL_IF_CONFIG_SMALL("AVFrame to AVPacket passthrough"), + .props = AV_CODEC_PROP_LOSSLESS, + }, /* image codecs */ { |
