Michael Niedermayer 93342de1d8 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>

2012-07-24 21:15:57 +02:00

..

aiff

…

alaw

…

asf

…

au

…

avi

…

bmp

…

caf

…

dpx

…

dv_fmt

ffmpeg: rework checks for the -t option.

2012-07-04 16:20:47 +02:00

ffm

…

flv_fmt

…

gif

…

gxf

ffmpeg: rework checks for the -t option.

2012-07-04 16:20:47 +02:00

ismv

ffmpeg: rework checks for the -t option.

2012-07-04 16:20:47 +02:00

jpg

…

mkv

…

mmf

…

mov

Merge remote-tracking branch 'qatar/master'

2012-07-24 21:15:57 +02:00

mpg

ffmpeg: rework checks for the -t option.

2012-07-04 16:20:47 +02:00

mulaw

…

mxf

ffmpeg: rework checks for the -t option.

2012-07-04 16:20:47 +02:00

mxf_d10

…

nut

…

ogg

ffmpeg: rework checks for the -t option.

2012-07-04 16:20:47 +02:00

pam

…

pbmpipe

…

pcx

…

pgm

…

pgmpipe

…

pixfmt

…

png

…

ppm

…

ppmpipe

…

rm

…

rso

…

sgi

…

sox

…

sunrast

…

swf

…

tga

…

tiff

…

ts

…

voc

…

voc_s16

…

wav

…

wtv

…

xbm

…

xwd

…

yuv4mpeg

…