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/allcodecs.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/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index c8f7992..b506463 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -337,6 +337,7 @@ void avcodec_register_all(void) REGISTER_DECODER(VP9, vp9); REGISTER_DECODER(VQA, vqa); REGISTER_DECODER(WEBP, webp); + REGISTER_ENCODER(WRAPPED_AVFRAME, wrapped_avframe); REGISTER_ENCDEC (WMV1, wmv1); REGISTER_ENCDEC (WMV2, wmv2); REGISTER_DECODER(WMV3, wmv3); |
