diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 05:00:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-21 05:32:03 +0200 |
| commit | 6d32bcd770c638e49d69a4d5eb5464cfa4f35d9a (patch) | |
| tree | 892dbfcfc54c4acdfe9619fdb597eb741c6abae6 /libavformat | |
| parent | 840238b8706ea2ca740cf4b49bffd8ae196352f9 (diff) | |
| parent | a1d0dcc7134f1401c682b5e13d4ab3864da21efb (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: make executable again
LATM/AAC: Free previously initialized context on reinit.
configure: Do not unconditionally add -Wall to host CFLAGS.
configure: Set OS/2 objformat to a.out.
Add support for a.out object format to assembler macros.
fate: disable threading for encoding
fate: add comment field
fate: allow overriding default build and install dirs
mpegtsenc: Add an AVClass pointer to the private data
mpegaudio: clean up #includes
mpegaudio: move all header parsing to mpegaudiodecheader.[ch]
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mp3enc.c | 1 | ||||
| -rw-r--r-- | libavformat/mpegtsenc.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 082450779f..2775eb8fc8 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -27,6 +27,7 @@ #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" +#include "libavcodec/mpegaudio.h" #include "libavcodec/mpegaudiodata.h" #include "libavcodec/mpegaudiodecheader.h" #include "libavformat/avio_internal.h" diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index e7d70015aa..687057b9f8 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -53,6 +53,7 @@ typedef struct MpegTSService { } MpegTSService; typedef struct MpegTSWrite { + const AVClass *av_class; MpegTSSection pat; /* MPEG2 pat table */ MpegTSSection sdt; /* MPEG2 sdt table context */ MpegTSService **services; |