diff options
| author | wm4 <wm4@nowhere> | 2013-11-12 23:42:04 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-12 23:42:04 +0100 |
| commit | e4bbb1d348dafbb32722f413648006a7bd9d0897 (patch) | |
| tree | 7165ed9f86a77b751187600d0a9de8b35416f380 /audio/fmt-conversion.c | |
| parent | e4f2fcc0ecd31322df65141edf0ddbff9c075f5d (diff) | |
| parent | 22b3f522cacfbdba76d311c86efd6091512eb089 (diff) | |
| download | mpv-e4bbb1d348dafbb32722f413648006a7bd9d0897.tar.bz2 mpv-e4bbb1d348dafbb32722f413648006a7bd9d0897.tar.xz | |
Merge branch 'planar_audio'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'audio/fmt-conversion.c')
| -rw-r--r-- | audio/fmt-conversion.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/audio/fmt-conversion.c b/audio/fmt-conversion.c index 94f1fbd1f3..93fda3eaa0 100644 --- a/audio/fmt-conversion.c +++ b/audio/fmt-conversion.c @@ -32,6 +32,12 @@ static const struct { {AV_SAMPLE_FMT_FLT, AF_FORMAT_FLOAT_NE}, {AV_SAMPLE_FMT_DBL, AF_FORMAT_DOUBLE_NE}, + {AV_SAMPLE_FMT_U8P, AF_FORMAT_U8P}, + {AV_SAMPLE_FMT_S16P, AF_FORMAT_S16P}, + {AV_SAMPLE_FMT_S32P, AF_FORMAT_S32P}, + {AV_SAMPLE_FMT_FLTP, AF_FORMAT_FLOATP}, + {AV_SAMPLE_FMT_DBLP, AF_FORMAT_DOUBLEP}, + {AV_SAMPLE_FMT_NONE, 0}, }; |