Merge branch 'development' into LTS_development

# Conflicts: # src/output/output_progressive_flv.cpp # src/output/output_rtmp.cpp
2017-06-19 12:46:41 +02:00 · 2017-06-19 12:46:41 +02:00 · de4fea643a
commit de4fea643a
parent ca65576510 cef78b7d08
5 changed files with 134 additions and 71 deletions
--- a/lib/flv_tag.cpp
+++ b/lib/flv_tag.cpp
@ -182,7 +182,11 @@ const char * FLV::Tag::getVideoCodec() {
 const char * FLV::Tag::getAudioCodec() {
  switch (data[11] & 0xF0) {
    case 0x00:
-      return "PCMPE";
+      if (data[11] & 0x02){
+        return "PCMPE";//unknown endianness
+      }else{
+        return "PCM";//8 bit is always regular PCM
+      }
    case 0x10:
      return "ADPCM";
    case 0x20: