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 /libavutil | |
| 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 'libavutil')
| -rw-r--r-- | libavutil/crc.h | 1 | ||||
| -rw-r--r-- | libavutil/intfloat_readwrite.c | 1 | ||||
| -rw-r--r-- | libavutil/md5.h | 1 | ||||
| -rw-r--r-- | libavutil/mem.c | 1 |
4 files changed, 1 insertions, 3 deletions
diff --git a/libavutil/crc.h b/libavutil/crc.h index 6c0baab5ac..12650542ba 100644 --- a/libavutil/crc.h +++ b/libavutil/crc.h @@ -41,4 +41,3 @@ const AVCRC *av_crc_get_table(AVCRCId crc_id); uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length) av_pure; #endif /* AVUTIL_CRC_H */ - diff --git a/libavutil/intfloat_readwrite.c b/libavutil/intfloat_readwrite.c index 991aa7886c..2998229e49 100644 --- a/libavutil/intfloat_readwrite.c +++ b/libavutil/intfloat_readwrite.c @@ -95,4 +95,3 @@ AVExtFloat av_dbl2ext(double d){ ext.exponent[0] |= 0x80; return ext; } - diff --git a/libavutil/md5.h b/libavutil/md5.h index 1333ab2ddf..a3534edad0 100644 --- a/libavutil/md5.h +++ b/libavutil/md5.h @@ -43,4 +43,3 @@ void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len); */ #endif /* AVUTIL_MD5_H */ - diff --git a/libavutil/mem.c b/libavutil/mem.c index f965339ce9..d711350fda 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -228,3 +228,4 @@ void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem) tab[nb++] = (intptr_t)elem; *nb_ptr = nb; } + |