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 /libavcodec/mp3_header_decompress_bsf.c | |
| 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 'libavcodec/mp3_header_decompress_bsf.c')
| -rw-r--r-- | libavcodec/mp3_header_decompress_bsf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mp3_header_decompress_bsf.c b/libavcodec/mp3_header_decompress_bsf.c index 7af5a10e12..a9c23b17ce 100644 --- a/libavcodec/mp3_header_decompress_bsf.c +++ b/libavcodec/mp3_header_decompress_bsf.c @@ -20,7 +20,7 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" -#include "mpegaudio.h" +#include "mpegaudiodecheader.h" #include "mpegaudiodata.h" |