summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-23 21:24:41 +0100
committerwm4 <wm4@nowhere>2013-12-23 21:24:41 +0100
commit96e6f3f4b6a7379fac6b61c741c57ccfc062f915 (patch)
tree32aa7990dfa0796e458d093654cf4925a191203b
parent0656134179136076f34d375c2b2f9779a177cf1a (diff)
downloadmpv-96e6f3f4b6a7379fac6b61c741c57ccfc062f915.tar.bz2
mpv-96e6f3f4b6a7379fac6b61c741c57ccfc062f915.tar.xz
audio: fix format ID conversion
AV_SAMPLE_FMT_NONE != 0, could apparently cause crashes in certain situations.
-rw-r--r--audio/fmt-conversion.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/fmt-conversion.c b/audio/fmt-conversion.c
index 6072305424..5550e698d9 100644
--- a/audio/fmt-conversion.c
+++ b/audio/fmt-conversion.c
@@ -46,7 +46,7 @@ enum AVSampleFormat af_to_avformat(int fmt)
if (audio_conversion_map[i].fmt == fmt)
return audio_conversion_map[i].sample_fmt;
}
- return 0;
+ return AV_SAMPLE_FMT_NONE;
}
int af_from_avformat(enum AVSampleFormat sample_fmt)