diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 14:26:31 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 14:26:31 +0400 |
| commit | aed58f6aae0c00a0df5ef31ec3362f47ce773f62 (patch) | |
| tree | 384ea3e666a7c57bbcf6b158936b2eb7b6e5a78b /libavformat/rtpdec_vp8.c | |
| parent | f3c9d8d41bca254aab993d5f783297fde0c802ae (diff) | |
| parent | 92e354b655613b88c3c202a7e19e7037daed37eb (diff) | |
Merge commit '92e354b655613b88c3c202a7e19e7037daed37eb'
* commit '92e354b655613b88c3c202a7e19e7037daed37eb':
rtpdec_vp8: Set the timestamp when returning a deferred packet
hlsenc: Make the start_number option set the right variable
Conflicts:
libavformat/hlsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_vp8.c')
| -rw-r--r-- | libavformat/rtpdec_vp8.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/rtpdec_vp8.c b/libavformat/rtpdec_vp8.c index bfac77d6ef..de773f5d67 100644 --- a/libavformat/rtpdec_vp8.c +++ b/libavformat/rtpdec_vp8.c @@ -79,6 +79,7 @@ static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8, int ret = ff_rtp_finalize_packet(pkt, &vp8->data, st->index); if (ret < 0) return ret; + *timestamp = vp8->timestamp; return 0; } return AVERROR(EAGAIN); |