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 /libavcodec/wmalosslessdec.c | |
| parent | b1a0d694ea973c4de91fbb1fb46858cff6f6e91b (diff) | |
| parent | e9c0b12c2e6dd81d047669178719f68f18741f9c (diff) | |
| download | ffmpeg-streaming-6716e6892baf0036f58d02011b8aac8c766970a4.zip ffmpeg-streaming-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 'libavcodec/wmalosslessdec.c')
| -rw-r--r-- | libavcodec/wmalosslessdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index 326bfba..2137722 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -1229,7 +1229,7 @@ static int decode_packet(AVCodecContext *avctx, void *data, int *got_frame_ptr, } *(AVFrame *)data = s->frame; - *got_frame_ptr = 1; + *got_frame_ptr = s->frame.nb_samples > 0; s->packet_offset = get_bits_count(gb) & 7; return (s->packet_loss) ? AVERROR_INVALIDDATA : get_bits_count(gb) >> 3; @@ -1243,6 +1243,6 @@ AVCodec ff_wmalossless_decoder = { .priv_data_size = sizeof(WmallDecodeCtx), .init = decode_init, .decode = decode_packet, - .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, + .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1 | CODEC_CAP_DELAY, .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio Lossless"), }; |
