Same file names in multiple directories with similar content

Hello Ingemar,

in multiple directories, we find files with the same filename. Sometimes, they have same content, sometimes, the content differs (see below).

This version of the files shall we use?

With best regards,

Christian

scream/code/gscream/gst-gscreamrx/gst-plugin/src$ diff ScreamRx.cpp ../../../../ScreamRx.cpp 

284c284

<     buf[1] = 205;

---

>     buf[1] = 207;


scream/code/gscream/gst-gscreamrx/gst-plugin/src$ diff -w ScreamRx.h ../../../../ScreamRx.h

30c30

< extern "C" {

---

> 

144c144

< }

---

> 

scream/code/gscream/gst-gscreamrx/gst-plugin/src$ diff -w ScreamTx.h ../../../../ScreamTx.h

6a7

> extern "C" {

50a52,53

> // Max video rampup scale as fraction of the current target bitrate

> static const float kRampUpScale = 0.2f; 

141a145

> 		float rampUpScale = kRampUpScale,

334a339

> 			float rampUpScale,

357a363

> 		float rampUpScale;

659a666

> }

scream/code/gscream/gst-gscreamrx/gst-plugin/src$ diff ScreamTx0.h ScreamTx.h 

7d6

< extern "C" {

661d659

< }

diff -w RtpQueue.cpp ../../../../RtpQueue.cpp 

.... many differences ....

diff -w RtpQueue.h ../../../../RtpQueue.h

.... many differences ....

scream/code/gscream/gst-gscreamtx/gst-plugin/src$ diff -w ScreamRx.cpp ../../../../ScreamRx.cpp 

284c284

<     buf[1] = 205;

---

>     buf[1] = 207;