]>
Commit | Line | Data |
---|---|---|
07be6c12 JR |
1 | --- filter/filter_resample.c |
2 | +++ filter/filter_resample.c | |
3 | @@ -37,6 +37,7 @@ | |
4 | #include "libtc/optstr.h" | |
5 | #include "libtc/tcavcodec.h" | |
6 | #include "libtc/tcmodule-plugin.h" | |
7 | +#include <libavresample/avresample.h> | |
8 | ||
9 | ||
10 | typedef struct { | |
11 | @@ -45,7 +46,7 @@ typedef struct { | |
12 | ||
13 | int bytes_per_sample; | |
14 | ||
15 | - ReSampleContext *resample_ctx; | |
16 | + AVAudioResampleContext *resample_ctx; | |
17 | } ResamplePrivateData; | |
18 | ||
19 | static const char resample_help[] = "" | |
20 | --- import/probe_ffmpeg.c | |
21 | +++ import/probe_ffmpeg.c | |
22 | @@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info) | |
23 | info->bitrate = st->codec->bit_rate / 1000; | |
24 | info->width = st->codec->width; | |
25 | info->height = st->codec->height; | |
26 | - if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0) { | |
27 | - info->fps = av_q2d(st->r_frame_rate); | |
28 | + if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0) { | |
29 | + info->fps = av_q2d(st->avg_frame_rate); | |
30 | } else { | |
31 | /* watch out here */ | |
32 | info->fps = 1.0/av_q2d(st->codec->time_base); |