diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-29 00:34:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-29 00:34:59 +0100 |
| commit | c065255bba62ebef145f80cd8d805ef1a9eca133 (patch) | |
| tree | 675d1241b8488fef70b14a566e59a9070682f08c /libavformat/id3v1.h | |
| parent | 97dece333df07befa4052ed6f5a823ec3103a67d (diff) | |
| parent | 2e626dd5136f4daa244b37284e22483cdc7df1ac (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacenc: Fix LONG_START windowing.
aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
avplay: use the correct array size for stride.
lavc: extend doxy for avcodec_alloc_context3().
APIchanges: mention avcodec_alloc_context()/2/3
avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
aacsbr: ARM NEON optimised sbrdsp functions
aacsbr: align some arrays
aacsbr: move some simdable loops to function pointers
cosmetics: Remove extra newlines at EOF
Conflicts:
libavcodec/utils.c
libavfilter/formats.c
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/id3v1.h')
| -rw-r--r-- | libavformat/id3v1.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/id3v1.h b/libavformat/id3v1.h index 8eb58be2d1..d5dca35873 100644 --- a/libavformat/id3v1.h +++ b/libavformat/id3v1.h @@ -39,4 +39,3 @@ extern const char * const ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1]; void ff_id3v1_read(AVFormatContext *s); #endif /* AVFORMAT_ID3V1_H */ - |