diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 19:08:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 19:15:11 +0100 |
| commit | 5318cf521f66cd58642c07e8036f6232d4c60ed2 (patch) | |
| tree | 5a2ca7a5beae44353f2d7621f0a0073cf9c33785 /libavcodec/opus_parser.c | |
| parent | 988ca9bd53c0bd240383ccf7b0ca0eb7224a8ff5 (diff) | |
| parent | 9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0 (diff) | |
Merge commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0'
* commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0':
mpegts: add support for Opus
Conflicts:
libavcodec/opus_parser.c
libavformat/mpegts.c
See: 74141f693ded2fbf75af56fff309d2db35183635
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/opus_parser.c')
| -rw-r--r-- | libavcodec/opus_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/opus_parser.c b/libavcodec/opus_parser.c index b128a40404..c30fd7bbd4 100644 --- a/libavcodec/opus_parser.c +++ b/libavcodec/opus_parser.c @@ -26,9 +26,9 @@ */ #include "avcodec.h" +#include "bytestream.h" #include "opus.h" #include "parser.h" -#include "bytestream.h" typedef struct OpusParseContext { OpusContext ctx; |