diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-01 17:34:18 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-01 17:34:18 +0400 |
| commit | 911e2706884020caf8b9b8ca67a2ad3801f067f4 (patch) | |
| tree | 7ba99b5be6270aaeffab8bf53deae8cc7d93cdd9 /libavformat/bink.c | |
| parent | 1bc51a7a74fc1ae005a70af36c9f01b7b8463994 (diff) | |
| parent | 6c1a7d07eb41b4cf36e48ebb560fecd9504fd968 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Use proper "" quotes for local header #includes
ppc: fmtconvert: Drop two unused variables.
bink demuxer: set framerate.
Conflicts:
libavcodec/kbdwin.c
libavcodec/ppc/fmtconvert_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bink.c')
| -rw-r--r-- | libavformat/bink.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/bink.c b/libavformat/bink.c index c77a8f84e7..887f70a512 100644 --- a/libavformat/bink.c +++ b/libavformat/bink.c @@ -112,6 +112,7 @@ static int read_header(AVFormatContext *s) return AVERROR(EIO); } avpriv_set_pts_info(vst, 64, fps_den, fps_num); + vst->avg_frame_rate = av_inv_q(vst->time_base); vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; vst->codec->codec_id = AV_CODEC_ID_BINKVIDEO; |