Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/nschlia/ffmpegfs
Browse files Browse the repository at this point in the history
  • Loading branch information
nschlia committed Jan 21, 2024
2 parents de15919 + 48eb91c commit 200a3fa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion FEATURES.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Some new codec combinations are now possible (the default codecs are in bold):
| Formats | Audio Codecs | Video Codecs |
| ------- | ----------------- | ---------------------------- |
| MP4 | **AAC**, MP3 | **H264**, H265, MPEG1, MPEG2 |
| WebM | **OPUS**, VORBIS | **VP9**, VP8, AV1 |
| WebM | **OPUS**, VORBIS | **VP9**, VP8 |
| MOV | **AAC**, AC3, MP3 | **H264**, H265, MPEG1, MPEG2 |
| TS, HLS | **AAC**, AC3, MP3 | **H264**, H265, MPEG1, MPEG2 |

Expand Down

0 comments on commit 200a3fa

Please sign in to comment.