diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:21:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:27:07 +0200 |
| commit | 1b58f1376132026a7633fea253f0ed67a8392343 (patch) | |
| tree | a9c9f17d083967a9e231643e8fee155f9f678a6c /libavformat/dvenc.c | |
| parent | 9098f0ecd7bfa8e971ab92bd0c244cb003ef43b2 (diff) | |
| parent | f6ee61fb05482c617f5deee29a190d8ff483b3d1 (diff) | |
| download | ffmpeg-1b58f1376132026a7633fea253f0ed67a8392343.tar.gz | |
Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'
* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1':
lavc: export DV profile API used by muxer/demuxer as public
Conflicts:
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/dv_profile.c
libavcodec/dv_profile.h
libavcodec/version.h
libavformat/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 bd484d96e8..8f5277dca0 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -45,7 +45,7 @@ struct DVMuxContext { AVClass *av_class; - 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 */ @@ -72,7 +72,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]))]; @@ -314,7 +314,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; |