RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-02 12:53:29 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/dpx: Read alternative frame rate from television header

Browse Source 
Signed-off-by: Harry Mallon <harry.mallon@codex.online>
This commit is contained in:
Harry Mallon 2020-12-07 10:32:10 +00:00 committed by Paul B Mahol
parent 4bdfbd688f
commit 6623421454
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/dpx.c
View File

@ -216,10 +216,23 @@ static int decode_frame(AVCodecContext *avctx,
else else
avctx->sample_aspect_ratio = (AVRational){ 0, 1 }; avctx->sample_aspect_ratio = (AVRational){ 0, 1 };
/* preferred frame rate from Motion-picture film header */
if (offset >= 1724 + 4) { if (offset >= 1724 + 4) {
buf = avpkt->data + 1724; buf = avpkt->data + 1724;
i = read32(&buf, endian); i = read32(&buf, endian);
if(i) { if(i && i != 0xFFFFFFFF) {
AVRational q = av_d2q(av_int2float(i), 4096);
if (q.num > 0 && q.den > 0)
avctx->framerate = q;
}
}
/* alternative frame rate from television header */
if (offset >= 1940 + 4 &&
!(avctx->framerate.num && avctx->framerate.den)) {
buf = avpkt->data + 1940;
i = read32(&buf, endian);
if(i && i != 0xFFFFFFFF) {
AVRational q = av_d2q(av_int2float(i), 4096); AVRational q = av_d2q(av_int2float(i), 4096);
if (q.num > 0 && q.den > 0) if (q.num > 0 && q.den > 0)
avctx->framerate = q; avctx->framerate = q;