diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rdt.h | 14 | ||||
| -rw-r--r-- | libavformat/rtsp.h | 4 | ||||
| -rw-r--r-- | libavformat/url.h | 6 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/libavformat/rdt.h b/libavformat/rdt.h index 19a4a7bc1f..c2ec94b8b4 100644 --- a/libavformat/rdt.h +++ b/libavformat/rdt.h @@ -80,16 +80,16 @@ void ff_rdt_subscribe_rule(char *cmd, int size, * * @param buf input buffer * @param len length of input buffer - * @param set_id will be set to the set ID this packet belongs to - * @param seq_no will be set to the sequence number of the packet - * @param stream_id will be set to the stream ID this packet belongs to - * @param is_keyframe will be whether this packet belongs to a keyframe - * @param timestamp will be set to the timestamp of the packet + * @param pset_id will be set to the set ID this packet belongs to + * @param pseq_no will be set to the sequence number of the packet + * @param pstream_id will be set to the stream ID this packet belongs to + * @param pis_keyframe will be whether this packet belongs to a keyframe + * @param ptimestamp will be set to the timestamp of the packet * @return the amount of bytes consumed, or negative on error */ int ff_rdt_parse_header(const uint8_t *buf, int len, - int *set_id, int *seq_no, int *stream_id, - int *is_keyframe, uint32_t *timestamp); + int *pset_id, int *pseq_no, int *pstream_id, + int *pis_keyframe, uint32_t *ptimestamp); /** * Parse RDT-style packet data (header + media data). diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index f5cf823de3..469cd21cc9 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -488,9 +488,9 @@ void ff_rtsp_close_streams(AVFormatContext *s); /** * Close all connection handles within the RTSP (de)muxer * - * @param rt RTSP (de)muxer context + * @param s RTSP (de)muxer context */ -void ff_rtsp_close_connections(AVFormatContext *rt); +void ff_rtsp_close_connections(AVFormatContext *s); /** * Get the description of the stream and set up the RTSPStream child diff --git a/libavformat/url.h b/libavformat/url.h index 5ef6a21d7b..103f7b6c00 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -74,12 +74,12 @@ typedef struct URLProtocol { * @return 0 in case of success, a negative value corresponding to an * AVERROR code in case of failure */ -int ffurl_alloc(URLContext **h, const char *url, int flags); +int ffurl_alloc(URLContext **puc, const char *filename, int flags); /** * Connect an URLContext that has been allocated by ffurl_alloc */ -int ffurl_connect(URLContext *h); +int ffurl_connect(URLContext *uc); /** * Create an URLContext for accessing to the resource indicated by @@ -92,7 +92,7 @@ int ffurl_connect(URLContext *h); * @return 0 in case of success, a negative value corresponding to an * AVERROR code in case of failure */ -int ffurl_open(URLContext **h, const char *url, int flags); +int ffurl_open(URLContext **puc, const char *filename, int flags); /** * Read up to size bytes from the resource accessed by h, and store diff --git a/libavformat/utils.c b/libavformat/utils.c index 3d949baf24..f459fdd707 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2438,7 +2438,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) least one frame of codec data, this makes sure the codec initializes the channel configuration and does not only trust the values from the container. */ - try_decode_frame(st, pkt, (options && i <= orig_nb_streams )? &options[i] : NULL); + try_decode_frame(st, pkt, (options && i < orig_nb_streams )? &options[i] : NULL); st->codec_info_nb_frames++; count++; diff --git a/libavformat/version.h b/libavformat/version.h index 7eb30768b5..09e52da45f 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -24,7 +24,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 53 -#define LIBAVFORMAT_VERSION_MINOR 5 +#define LIBAVFORMAT_VERSION_MINOR 6 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |