diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-14 01:12:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-14 02:12:49 +0100 |
| commit | 3b537eab27bb34f5f63b06097fbd52ff5941c3f6 (patch) | |
| tree | 74270267a7a3b23148a23cbf90b1472b57a09609 /libavformat | |
| parent | 28a6f970f64c4d5c1326dd68393bedf73cc42e10 (diff) | |
| download | ffmpeg-3b537eab27bb34f5f63b06097fbd52ff5941c3f6.tar.gz | |
avformat/nutenc: store the actual r_frame_rate in the corresponding field if available
Fixes Ticket 3629 part3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/nutenc.c | 5 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 3424e26edb..c335e6455a 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -524,7 +524,10 @@ static int write_streaminfo(NUTContext *nut, AVIOContext *bc, int stream_id) { } if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { uint8_t buf[256]; - snprintf(buf, sizeof(buf), "%d/%d", st->codec->time_base.den, st->codec->time_base.num); + if (st->r_frame_rate.num>0 && st->r_frame_rate.den>0) + snprintf(buf, sizeof(buf), "%d/%d", st->r_frame_rate.num, st->r_frame_rate.den); + else + snprintf(buf, sizeof(buf), "%d/%d", st->codec->time_base.den, st->codec->time_base.num); count += add_info(dyn_bc, "r_frame_rate", buf); } dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf); diff --git a/libavformat/version.h b/libavformat/version.h index 5e73353d31..6664f2b1d7 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MINOR 15 -#define LIBAVFORMAT_VERSION_MICRO 104 +#define LIBAVFORMAT_VERSION_MICRO 105 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |