diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 15:21:15 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-11-26 01:37:33 +0100 |
| commit | 9b93805245eb54a37baa13831b04c980510ccda0 (patch) | |
| tree | 486b565986c324b68349c727e12431512c645a2a /libavutil/x86/float_dsp_init.c | |
| parent | 1d852105c200a313f9db34d2038dca6875a96780 (diff) | |
| download | ffmpeg-9b93805245eb54a37baa13831b04c980510ccda0.tar.gz | |
Merge commit 'd80811c94e068085aab797f9ba35790529126f85'
* commit 'd80811c94e068085aab797f9ba35790529126f85':
riff: Use the correct logging context
Conflicts:
libavformat/asfdec_o.c
libavformat/avidec.c
libavformat/dxa.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/riff.h
libavformat/riffdec.c
libavformat/wavdec.c
libavformat/wtvdec.c
libavformat/xwma.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ba77fb61f741d9ab3bd12935527556055b2ffb2e)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavutil/x86/float_dsp_init.c')
0 files changed, 0 insertions, 0 deletions