diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 13:45:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 13:45:36 +0100 |
| commit | c3f3c2256325532eb9ee8a44f1f43c31de79eb2f (patch) | |
| tree | ba393550cb042440ca0b55962e11d4bcb981d16f /libavcodec | |
| parent | a85311ef841b87ddaacf7c198f422db5c1ac2d60 (diff) | |
| parent | a717f9904227d7979473bad40c50eb40af41d01d (diff) | |
| download | ffmpeg-c3f3c2256325532eb9ee8a44f1f43c31de79eb2f.tar.gz | |
Merge commit 'a717f9904227d7979473bad40c50eb40af41d01d'
* commit 'a717f9904227d7979473bad40c50eb40af41d01d':
mpegts: Share the cleanup code between the demuxer and lavf-internal parser functions
rtpdec_mpeg4: Return one AAC AU per AVPacket
ppc: Include string.h for memset
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ppc/vp3dsp_altivec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/ppc/vp3dsp_altivec.c b/libavcodec/ppc/vp3dsp_altivec.c index b3581ab708..6271dea560 100644 --- a/libavcodec/ppc/vp3dsp_altivec.c +++ b/libavcodec/ppc/vp3dsp_altivec.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> + #include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" |