aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/pcmdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-25 16:55:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-25 16:55:31 +0200
commita6ff8514a9bdc93739a73d28913c6b457baff32d (patch)
treeed4f3c885586b33b7d8229e606acc80cd8c8ca50 /libavformat/pcmdec.c
parentfec512a52cdd1bab84958474cc160fdb7be81dec (diff)
parentdc5385806339f90b4eb074d9002205ebb4010cc2 (diff)
downloadffmpeg-a6ff8514a9bdc93739a73d28913c6b457baff32d.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: wtv: Check the return value from gmtime x86: fft: convert sse inline asm to yasm x86: place some inline asm under #if HAVE_INLINE_ASM Conflicts: libavcodec/x86/fft_sse.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/pcmdec.c')
0 files changed, 0 insertions, 0 deletions