diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-09 13:06:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-09 13:06:04 +0200 |
| commit | ef9fe5bedd1993700818a0ba1c195cd6f6668afe (patch) | |
| tree | 3c70bf61e4bae16375575e3e6e8dac55fc1ba148 /libavformat/file.c | |
| parent | 238e904df3988ea0253ba08c8b2883e4740565b6 (diff) | |
| parent | a75b9a1804769169456306f570b6716d977ebdc5 (diff) | |
| download | ffmpeg-ef9fe5bedd1993700818a0ba1c195cd6f6668afe.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mingw/cygwin: Stop adding -fno-common to gcc CFLAGS
Restructure av_log_missing_feature message
rtp: Support packetization/depacketization of opus
file: Set the return value type for lseek to int64_t.
ppc: fix Altivec build with old compilers
build: add LTO support for PGI compiler
build: add -Mdse to PGI optimisation flags
rtpenc_vp8: Update the packetizer to the latest spec version
rtpdec_vp8: Make the depacketizer implement the latest spec draft
doc: allow building with old texi2html versions
avutil: skip old_pix_fmts.h since it is just a list
Conflicts:
libavcodec/aacdec.c
libavcodec/h264.c
libavcodec/ppc/fmtconvert_altivec.c
libavcodec/utils.c
libavformat/file.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/file.c')
| -rw-r--r-- | libavformat/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/file.c b/libavformat/file.c index 8c41a3c372..209957b9d3 100644 --- a/libavformat/file.c +++ b/libavformat/file.c @@ -135,7 +135,7 @@ static int file_open(URLContext *h, const char *filename, int flags) static int64_t file_seek(URLContext *h, int64_t pos, int whence) { FileContext *c = h->priv_data; - off_t ret; + int64_t ret; if (whence == AVSEEK_SIZE) { struct stat st; |