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/avcodec.h | |
| parent | d59bfcd11229300182c672ca734568919a85f773 (diff) | |
| parent | 00332e0a064dad866812de9162b009cbaba6f5df (diff) | |
| download | ffmpeg-037b44a3b44ead1cef8910c52fdd1343779b5203.tar.gz | |
Merge commit '00332e0a064dad866812de9162b009cbaba6f5df'
* commit '00332e0a064dad866812de9162b009cbaba6f5df':
wrapped_avframe: Initial implementation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 9b7ab3c32e..531286a5a0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -540,6 +540,7 @@ enum AVCodecID { AV_CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems * stream (only used by libavformat) */ AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. + AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket }; /** |