diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-22 20:58:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-22 20:59:58 +0100 |
| commit | 6716e6892baf0036f58d02011b8aac8c766970a4 (patch) | |
| tree | f2c95e6ee685cbbfbb8238e2c0884fc7995f4ee3 /tests | |
| parent | b1a0d694ea973c4de91fbb1fb46858cff6f6e91b (diff) | |
| parent | e9c0b12c2e6dd81d047669178719f68f18741f9c (diff) | |
| download | ffmpeg-6716e6892baf0036f58d02011b8aac8c766970a4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: Add ZeroCodec test
oggparseogm: fix order of arguments of avpriv_set_pts_info().
pngenc: better upper bound for encoded frame size.
aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
aiffdec: do not set bit rate if block duration is unknown
wmall: output packet only if we have decoded some samples
Conflicts:
libavcodec/pngenc.c
tests/fate/lossless-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/lossless-video.mak | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index bf2df177de..9293b96b54 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -24,3 +24,4 @@ fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi FATE_TESTS += $(FATE_LOSSLESS_VIDEO) fate-lossless-video: $(FATE_LOSSLESS_VIDEO) + |