Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Mar 2012 00:12:08 +0000 (01:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Mar 2012 00:12:08 +0000 (01:12 +0100)
* qatar/master:
  Fix a bunch of common typos.
  build: Skip compiling xvmc.h under the correct condition.
  configure: darwin: Change dylib install names to include major version.
  mpegts: Always honor a registration descriptor if present and there is no other codec information.
  aacdec: Fix SCE parity check.
  aacdec: Fix out of array writes (stack).
  rtsp: Only set the ttl parameter if the server actually gave a value
  udp: Set ttl for read-write streams, too, not only for write-only ones
  udp: Only bind to the multicast address if in read-only mode
  udp: Clarify the comment about binding the multicast address
  udp: Reorder comments

Conflicts:
libavcodec/aacdec.c
tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/Makefile
libavcodec/aacdec.c
libavcodec/pgssubdec.c
libavcodec/vorbisenc.c
libavformat/mpegts.c
libavformat/r3d.c
libavformat/rtsp.c
libavformat/udp.c
tools/lavfi-showfiltfmts.c
tools/patcheck

diff --cc configure
+++ b/configure
@@@ -2652,9 -2462,8 +2652,9 @@@ case $target_os i
          enable malloc_aligned
          gas="gas-preprocessor.pl $cc"
          enabled ppc && add_asflags -force_cpusubtype_ALL
-         SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
+         SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
          enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
 +        strip="${strip} -x"
          add_ldflags -Wl,-dynamic,-search_paths_first
          SLIBSUF=".dylib"
          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
@@@ -741,13 -685,15 +741,13 @@@ SKIPHEADERS                            
  SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
  SKIPHEADERS-$(CONFIG_LIBDIRAC)         += libdirac.h
  SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
+ SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
  SKIPHEADERS-$(CONFIG_VAAPI)            += vaapi_internal.h
 -SKIPHEADERS-$(CONFIG_VDA)              += vda.h vda_internal.h
 +SKIPHEADERS-$(CONFIG_VDA)              += vda_internal.h
  SKIPHEADERS-$(CONFIG_VDPAU)            += vdpau.h
- SKIPHEADERS-$(CONFIG_XVMC)             += xvmc.h
  SKIPHEADERS-$(HAVE_W32THREADS)         += w32pthreads.h
  
 -EXAMPLES = api
 -
 -TESTPROGS = cabac dct fft fft-fixed golomb iirfilter rangecoder
 +TESTPROGS = cabac dct fft fft-fixed golomb iirfilter rangecoder snowenc
  TESTPROGS-$(HAVE_MMX) += motion
  TESTOBJS = dctref.o
  
Simple merge
Simple merge
Simple merge
@@@ -1385,13 -1349,9 +1385,12 @@@ int ff_parse_mpeg2_descriptor(AVFormatC
      case 0x05: /* registration descriptor */
          st->codec->codec_tag = bytestream_get_le32(pp);
          av_dlog(fc, "reg_desc=%.4s\n", (char*)&st->codec->codec_tag);
-         if (st->codec->codec_id == CODEC_ID_NONE &&
-             stream_type == STREAM_TYPE_PRIVATE_DATA)
+         if (st->codec->codec_id == CODEC_ID_NONE)
              mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types);
          break;
 +    case 0x52: /* stream identifier descriptor */
 +        st->stream_identifier = 1 + get8(pp, desc_end);
 +        break;
      default:
          break;
      }
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tools/patcheck
@@@ -67,8 -67,8 +67,7 @@@ $EGREP $OPT '^\+ *(const *|)static' $*
  cat $TMP
  hiegrep '# *ifdef * (HAVE|CONFIG)_' 'ifdefs that should be #if' $*
  
- hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|ouput|seperate|preceed|upto|paket|posible)\b' 'common typos' $*
 -hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention)\b' 'common typos' $*
--
++hiegrep '\b(awnser|cant|dont|wont|usefull|successfull|occured|teh|alot|wether|skiped|heigth|informations|colums|loosy|loosing|ouput|seperate|preceed|upto|paket|posible|unkown|inpossible|dimention)\b' 'common typos' $*
  hiegrep 'av_log\( *NULL' 'Missing context in av_log' $*
  hiegrep '[^sn]printf' 'Please use av_log' $*
  hiegrep '\bmalloc' 'Please use av_malloc' $*