diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-07-05 09:09:15 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-07-09 13:35:07 +0000 |
| commit | f6ee61fb05482c617f5deee29a190d8ff483b3d1 (patch) | |
| tree | d2d6d3d48c986270164e280c06deadd724bc5b24 /libavformat/dvenc.c | |
| parent | 3f3232a371cc88696184d9aef1f812656264e56c (diff) | |
lavc: export DV profile API used by muxer/demuxer as public
Diffstat (limited to 'libavformat/dvenc.c')
| -rw-r--r-- | libavformat/dvenc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 66d848cbce..a33973f192 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -41,7 +41,7 @@ #define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio struct DVMuxContext { - const DVprofile* sys; /* current DV profile, e.g.: 525/60, 625/50 */ + const AVDVProfile* sys; /* current DV profile, e.g.: 525/60, 625/50 */ int n_ast; /* number of stereo audio streams (up to 2) */ AVStream *ast[2]; /* stereo audio streams */ AVFifoBuffer *audio_data[2]; /* FIFO for storing excessive amounts of PCM */ @@ -67,7 +67,7 @@ static const int dv_aaux_packs_dist[12][9] = { { 0x50, 0x51, 0x52, 0x53, 0xff, 0xff, 0xff, 0xff, 0xff }, }; -static int dv_audio_frame_size(const DVprofile* sys, int frame) +static int dv_audio_frame_size(const AVDVProfile* sys, int frame) { return sys->audio_samples_dist[frame % (sizeof(sys->audio_samples_dist) / sizeof(sys->audio_samples_dist[0]))]; @@ -328,7 +328,7 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s) c->ast[i]->codec->channels != 2)) goto bail_out; } - c->sys = avpriv_dv_codec_profile(vst->codec); + c->sys = av_dv_codec_profile(vst->codec->width, vst->codec->height, vst->codec->pix_fmt); if (!c->sys) goto bail_out; |