diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 16:24:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 18:19:58 +0200 |
| commit | 2b37864e7f2bb78fd78904074f03449f70331e3d (patch) | |
| tree | e69100e9ec952178637e8569796735921fe3388d /libavformat/internal.h | |
| parent | 18255441dd74e0bde4fbc8f2f6a1a356fc14df6e (diff) | |
| parent | 2d6e58497e76836604364b037df9b00ba3d75b69 (diff) | |
Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'
* commit '2d6e58497e76836604364b037df9b00ba3d75b69':
lavf: switch to AVCodecContext.framerate for demuxing
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/internal.h')
| -rw-r--r-- | libavformat/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 30117069a9..f254e4c016 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -334,7 +334,7 @@ void ff_free_stream(AVFormatContext *s, AVStream *st); /** * Return the frame duration in seconds. Return 0 if not available. */ -void ff_compute_frame_duration(int *pnum, int *pden, AVStream *st, +void ff_compute_frame_duration(AVFormatContext *s, int *pnum, int *pden, AVStream *st, AVCodecParserContext *pc, AVPacket *pkt); unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id); |