aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpdec_latm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-02-07 01:40:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-02-07 01:40:29 +0100
commitb479e016128efe42e8b26ceb6c1b4a95b6d0c791 (patch)
tree30ab5e543d733f62a81deecce3a15404e46ce4f4 /libavformat/rtpdec_latm.c
parent6ba2505a0e894eeb326cfee95df9e1c030bcde3e (diff)
parentd016d3074cc084ea813e389f046eee01ecd48b7e (diff)
downloadffmpeg-b479e016128efe42e8b26ceb6c1b4a95b6d0c791.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: Revert "v210enc: use FFALIGN()" doxygen: Do not include license boilerplates in Doxygen comment blocks. avplay: reset decoder flush state when seeking ape: skip packets with invalid size ape: calculate final packet size instead of guessing ape: stop reading after the last frame has been read ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished ape: return error if seeking to the current packet fails in ape_read_packet() avcodec: Clarify AVFrame member documentation. v210dec: check for coded_frame allocation failure v210enc: use stride as it is already calculated v210enc: use FFALIGN() v210enc: return proper AVERROR codes instead of -1 v210enc: do not set coded_frame->key_frame v210enc: check for coded_frame allocation failure drawtext: add 'fix_bounds' option on coords fixing drawtext: fix text_{w, h} expression vars drawtext: add missing braces around an if() block. Conflicts: libavcodec/arm/vp8.h libavcodec/arm/vp8dsp_init_arm.c libavcodec/v210dec.c libavfilter/vf_drawtext.c libavformat/ape.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_latm.c')
-rw-r--r--libavformat/rtpdec_latm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpdec_latm.c b/libavformat/rtpdec_latm.c
index f08415dde7..a642b5a079 100644
--- a/libavformat/rtpdec_latm.c
+++ b/libavformat/rtpdec_latm.c
@@ -1,4 +1,4 @@
-/**
+/*
* RTP Depacketization of MP4A-LATM, RFC 3016
* Copyright (c) 2010 Martin Storsjo
*