Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code
  rtmp: Move the CONFIG_ condition into the if conditions
  aac: Mention abbreviation as well in long_name
  build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled
  doc: Add Git configuration section
  configure: Add a dependency on https for rtmpts
  rtp: Only choose static payload types if the sample rate and channels are right

Conflicts:
	doc/git-howto.texi
	libavformat/rtmpproto.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc doc/git-howto.texi
index cd30b4707b4438712f95f4c9cb82cdc21fd282c2,51141157c14e75d40ea3543f039212a78ed7e614..44e1cc643987e0b8806e6cedbc657250a9cb5cec
--- 1/doc/git-howto.texi
--- 2/doc/git-howto.texi
+++ b/doc/git-howto.texi
@@@ -258,7 -258,33 +258,33 @@@ git commi
  @end example
  
  
 -your personal Git installation and your local Libav repository.
+ @chapter Git configuration
+ 
+ In order to simplify a few workflows, it is advisable to configure both
 -to the libav-devel mailing list, add the following stanza
 -to @file{/path/to/libav/repository/.git/config}:
++your personal Git installation and your local FFmpeg repository.
+ 
+ @section Personal Git installation
+ 
+ Add the following to your @file{~/.gitconfig} to help @command{git send-email}
+ and @command{git format-patch} detect renames:
+ 
+ @example
+ [diff]
+         renames = copy
+ @end example
+ 
+ @section Repository configuration
+ 
+ In order to have @command{git send-email} automatically send patches
 -        to = libav-devel@@libav.org
++to the ffmpeg-devel mailing list, add the following stanza
++to @file{/path/to/ffmpeg/repository/.git/config}:
+ 
+ @example
+ [sendemail]
 -@chapter Libav specific
++        to = ffmpeg-devel@@ffmpeg.org
+ @end example
+ 
 +@chapter FFmpeg specific
  
  @section Reverting broken commits
  

diff --cc libavcodec/aacdec.c
Simple merge

diff --cc libavformat/Makefile
index 6a40fad3ef57c334189093ba5bb96bccd52bee76,2eb3e9c8de24fa7c873f4ca239ef709140c4630c..985da20ef0d14b3a6f073e0b1c4eaf060e58c43e
--- 1/libavformat/Makefile
--- 2/libavformat/Makefile
+++ b/libavformat/Makefile
@@@ -398,7 -365,12 +398,8 @@@ OBJS-$(CONFIG_TCP_PROTOCOL
  OBJS-$(CONFIG_TLS_PROTOCOL)              += tls.o
  OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
  
+ SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h
  SKIPHEADERS-$(CONFIG_NETWORK)            += network.h rtsp.h
 -
 -EXAMPLES  = metadata                                                    \
 -            output                                                      \
 -
  TESTPROGS = seek
  
  TOOLS     = aviocat                                                     \

diff --cc libavformat/rtmpcrypt.c
index 7dee0ad2a0b388ee7e9c2d6f9577b9fc4a6d798f,23125459b55d58eed2874760472b4f626aa7052d..06574164fe8af026bbe716cffb28d7522b77555d
--- 1/libavformat/rtmpcrypt.c
--- 2/libavformat/rtmpcrypt.c
+++ b/libavformat/rtmpcrypt.c
@@@ -1,10 -1,12 +1,12 @@@
  /*
   * RTMPE network protocol
+  * Copyright (c) 2008-2009 Andrej Stepanchuk
+  * Copyright (c) 2009-2010 Howard Chu
   * Copyright (c) 2012 Samuel Pitoiset
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc libavformat/rtmpdh.c
index fad87fca3bd994778b8430e194eb87626de9c07d,92bce7a0bc8876521f36e033d125a5465b1711ee..03582eafb98f8b3300dec7250dee4cc3afc757ba
--- 1/libavformat/rtmpdh.c
--- 2/libavformat/rtmpdh.c
+++ b/libavformat/rtmpdh.c
@@@ -1,10 -1,12 +1,12 @@@
  /*
   * RTMP Diffie-Hellmann utilities
+  * Copyright (c) 2009 Andrej Stepanchuk
+  * Copyright (c) 2009-2010 Howard Chu
   * Copyright (c) 2012 Samuel Pitoiset
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc libavformat/rtmpproto.c
Simple merge

diff --cc libavformat/rtp.c
Simple merge

diff --cc tests/ref/lavf/mov
index ca697751ba5b4ae6326402e1bdac6727f95610be,2db01d4aebe80caf99b069956e881de542feaaa2..a49904ede222a94a4134d3213c9b2e326f800ffe
--- 1/tests/ref/lavf/mov
--- 2/tests/ref/lavf/mov
+++ b/tests/ref/lavf/mov
@@@ -1,12 -1,3 +1,12 @@@
- 484aeef3be3eb4deef05c83bdc2dd484 *./tests/data/lavf/lavf.mov
- 367346 ./tests/data/lavf/lavf.mov
 -a5c982910b1a1547db68ffa35cc2a05a *./tests/data/lavf/lavf.mov
 -357741 ./tests/data/lavf/lavf.mov
++2c58e6422013d9cd6169f272ffba7a33 *./tests/data/lavf/lavf.mov
++367373 ./tests/data/lavf/lavf.mov
 +./tests/data/lavf/lavf.mov CRC=0x2f6a9b26
 +21b992f6a677f971dfd685cc055a2b0a *./tests/data/lavf/lavf.mov
 +358463 ./tests/data/lavf/lavf.mov
 +./tests/data/lavf/lavf.mov CRC=0x2f6a9b26
 +f607c5ac4f2668149c064d75a4ddd0dd *./tests/data/lavf/lavf.mov
 +377609 ./tests/data/lavf/lavf.mov
 +./tests/data/lavf/lavf.mov CRC=0x4e671506
 +305a68397e3cdb505704841fedcdc352 *./tests/data/lavf/lavf.mov
 +357845 ./tests/data/lavf/lavf.mov
  ./tests/data/lavf/lavf.mov CRC=0x2f6a9b26