Merge commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:14:32 +0000 (12:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:14:32 +0000 (12:14 +0200)
* commit '4908c8ef2706d98022bf27a5c5bca1fe109e7529':
  electronicarts: Improve some function/variable names

Conflicts:
libavformat/electronicarts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/electronicarts.c

@@@ -107,16 -106,16 +107,16 @@@ static int process_audio_header_element
      ea->sample_rate  = -1;
      ea->num_channels = 1;
  
-     while (!url_feof(pb) && inHeader) {
-         int inSubheader;
 -    while (!pb->eof_reached && in_header) {
++    while (!url_feof(pb) && in_header) {
+         int in_subheader;
          uint8_t byte;
          byte = avio_r8(pb);
  
          switch (byte) {
          case 0xFD:
              av_log(s, AV_LOG_DEBUG, "entered audio subheader\n");
-             inSubheader = 1;
-             while (!url_feof(pb) && inSubheader) {
+             in_subheader = 1;
 -            while (!pb->eof_reached && in_subheader) {
++            while (!url_feof(pb) && in_subheader) {
                  uint8_t subbyte;
                  subbyte = avio_r8(pb);