diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-01 02:44:19 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-01 02:54:24 +0100 |
commit | 9d76cf0b18976487d71e39bbdc1b53755e366535 (patch) | |
tree | d71801d63301c89e4c860eb2dee38b47348cd5b7 /libavformat/segafilm.c | |
parent | 0275b75a7e705ef5a6bd6610f1450671f78000b6 (diff) | |
parent | c8f0e88b205208da0e74f9345d4c4eb6d725774b (diff) | |
download | ffmpeg-9d76cf0b18976487d71e39bbdc1b53755e366535.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec: Templatize the code for different g726 bitrate variants
rv40: move loop filter to rv34dsp context
lavf: make av_set_pts_info private.
rtpdec: Add support for G726 audio
rtpdec: Add an init function that can do custom codec context initialization
avconv: make copy_tb on by default.
matroskadec: don't set codec timebase.
rmdec: don't set codec timebase.
avconv: compute next_pts from input packet duration when possible.
lavf: estimate frame duration from r_frame_rate.
avconv: update InputStream.pts in the streamcopy case.
Conflicts:
avconv.c
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/oss_audio.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavformat/au.c
libavformat/eacdata.c
libavformat/flvdec.c
libavformat/mpegts.c
libavformat/mxfenc.c
libavformat/rtpdec_g726.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/segafilm.c')
-rw-r--r-- | libavformat/segafilm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 8a49bef1dc..17b118a91c 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -29,6 +29,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "internal.h" #define FILM_TAG MKBETAG('F', 'I', 'L', 'M') #define FDSC_TAG MKBETAG('F', 'D', 'S', 'C') @@ -197,7 +198,7 @@ static int film_read_header(AVFormatContext *s, return AVERROR(ENOMEM); for(i=0; i<s->nb_streams; i++) - av_set_pts_info(s->streams[i], 33, 1, film->base_clock); + avpriv_set_pts_info(s->streams[i], 33, 1, film->base_clock); audio_frame_counter = 0; for (i = 0; i < film->sample_count; i++) { |