aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-05 01:12:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-05 01:12:19 +0100
commit9575d8a652c07ac26dc797f78a53ec82f6db38fc (patch)
tree306cfde8daebd0c8e53127c82096c29f113fe589 /libavformat
parent7c2e35d1d0f1626917a8b0fb56916f2ef929762d (diff)
parent15621cbbe4ed88409ef40257afaf239487964e98 (diff)
downloadffmpeg-9575d8a652c07ac26dc797f78a53ec82f6db38fc.tar.gz
Merge commit '15621cbbe4ed88409ef40257afaf239487964e98'
* commit '15621cbbe4ed88409ef40257afaf239487964e98': rtpdec_asf: Don't set RTP_FLAG_KEY Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/rtpdec_asf.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c
index 12913b4eb0..e8377b9389 100644
--- a/libavformat/rtpdec_asf.c
+++ b/libavformat/rtpdec_asf.c
@@ -205,8 +205,6 @@ static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf,
int start_off = avio_tell(pb);
mflags = avio_r8(pb);
- if (mflags & 0x80)
- flags |= RTP_FLAG_KEY;
len_off = avio_rb24(pb);
if (mflags & 0x20) /**< relative timestamp */
avio_skip(pb, 4);