diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-24 20:43:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-24 21:15:57 +0200 |
| commit | 93342de1d88081822dad55af70dd4738cd15d242 (patch) | |
| tree | 7dd3f6fe644743880f7be2554570bda7497688c7 /tests | |
| parent | 3ccf22c64a0065fa08fe642500f193394fd83d01 (diff) | |
| parent | 6a433fdba82ff241be2e9193f66a43689766e4d7 (diff) | |
| download | ffmpeg-93342de1d88081822dad55af70dd4738cd15d242.tar.gz | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/lavf/mov | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index ca697751ba..a49904ede2 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,5 +1,5 @@ -484aeef3be3eb4deef05c83bdc2dd484 *./tests/data/lavf/lavf.mov -367346 ./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 |