summaryrefslogtreecommitdiffstats
path: root/audio/fmt-conversion.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-21 18:29:42 +0100
committerwm4 <wm4@nowhere>2013-12-21 20:50:12 +0100
commit60c06fec1e45e1ddb285fe54f1106e1fc8838edd (patch)
treeaad2b74d464e0d0862605c806e60e1169b8ed49d /audio/fmt-conversion.c
parent1974c9b49d7bf09469362ef6ba1214f625ecb40a (diff)
downloadmpv-60c06fec1e45e1ddb285fe54f1106e1fc8838edd.tar.bz2
mpv-60c06fec1e45e1ddb285fe54f1106e1fc8838edd.tar.xz
audio/fmt-conversion.c: remove unknown audio format messages
Same deal as with video/fmt-conversion.c.
Diffstat (limited to 'audio/fmt-conversion.c')
-rw-r--r--audio/fmt-conversion.c21
1 files changed, 7 insertions, 14 deletions
diff --git a/audio/fmt-conversion.c b/audio/fmt-conversion.c
index 65f84945c1..6072305424 100644
--- a/audio/fmt-conversion.c
+++ b/audio/fmt-conversion.c
@@ -16,7 +16,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "common/msg.h"
#include <libavutil/avutil.h>
#include <libavutil/samplefmt.h>
#include "format.h"
@@ -43,24 +42,18 @@ static const struct {
enum AVSampleFormat af_to_avformat(int fmt)
{
- int i;
- for (i = 0; audio_conversion_map[i].fmt; i++)
+ for (int i = 0; audio_conversion_map[i].fmt; i++) {
if (audio_conversion_map[i].fmt == fmt)
- break;
- return audio_conversion_map[i].sample_fmt;
+ return audio_conversion_map[i].sample_fmt;
+ }
+ return 0;
}
int af_from_avformat(enum AVSampleFormat sample_fmt)
{
- int i;
- for (i = 0; audio_conversion_map[i].fmt; i++)
+ for (int i = 0; audio_conversion_map[i].fmt; i++) {
if (audio_conversion_map[i].sample_fmt == sample_fmt)
- break;
- int fmt = audio_conversion_map[i].fmt;
- if (!fmt) {
- const char *fmtname = av_get_sample_fmt_name(sample_fmt);
- mp_msg(MSGT_GLOBAL, MSGL_ERR, "Unsupported AVSampleFormat %s (%d)\n",
- fmtname ? fmtname : "INVALID", sample_fmt);
+ return audio_conversion_map[i].fmt;
}
- return fmt;
+ return 0;
}