[SCM] libav/experimental: int / int64 fix by (Wolfram Gloger <wmglo @@@ dent:med:uni-muenchen:de>)
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:42:16 UTC 2013
The following commit has been merged in the experimental branch:
commit dc56fc38021cec000eda49a5e8ca145af049b89c
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Nov 23 18:23:56 2004 +0000
int / int64 fix by (Wolfram Gloger <wmglo @@@ dent:med:uni-muenchen:de>)
Originally committed as revision 3704 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 626c0d0..d2812b3 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -583,7 +583,7 @@ void av_set_pts_info(AVStream *s, int pts_wrap_bits,
#define AVSEEK_FLAG_BYTE 2 ///< seeking based on position in bytes
int av_find_default_stream_index(AVFormatContext *s);
-int av_index_search_timestamp(AVStream *st, int timestamp, int flags);
+int av_index_search_timestamp(AVStream *st, int64_t timestamp, int flags);
int av_add_index_entry(AVStream *st,
int64_t pos, int64_t timestamp, int distance, int flags);
int av_seek_frame_binary(AVFormatContext *s, int stream_index, int64_t target_ts, int flags);
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 6178d15..6b3bd5d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1046,7 +1046,8 @@ static int is_raw_stream(AVFormatContext *s)
* then it will be >=
* @return < 0 if no such timestamp could be found
*/
-int av_index_search_timestamp(AVStream *st, int wanted_timestamp, int backward)
+int av_index_search_timestamp(AVStream *st, int64_t wanted_timestamp,
+ int backward)
{
AVIndexEntry *entries= st->index_entries;
int nb_entries= st->nb_index_entries;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list