ffmpeg/tests/ref
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
..
fate vc1dec: dont apply the loop filter on fields 2012-07-24 04:55:13 +02:00
lavf Merge remote-tracking branch 'qatar/master' 2012-07-24 21:15:57 +02:00
lavf-fate mp3enc: add lame tag with start padding info 2012-07-14 17:20:22 +02:00
lavfi lavfi: add alphaextract and alphamerge filters 2012-07-22 12:17:34 +02:00
seek
vsynth1
vsynth2