}
-int avformat_alloc_output_context2(AVFormatContext **avctx, ff_const59 AVOutputFormat *oformat,
+int avformat_alloc_output_context2(AVFormatContext **avctx, const AVOutputFormat *oformat,
const char *format, const char *filename)
{
AVFormatContext *s = avformat_alloc_context();
s->priv_data = NULL;
if (filename) {
-#if FF_API_FORMAT_FILENAME
-FF_DISABLE_DEPRECATION_WARNINGS
- av_strlcpy(s->filename, filename, sizeof(s->filename));
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
if (!(s->url = av_strdup(filename)))
goto nomem;
(ret = av_opt_set_dict2(s->priv_data, &tmp, AV_OPT_SEARCH_CHILDREN)) < 0)
goto fail;
-#if FF_API_FORMAT_FILENAME
-FF_DISABLE_DEPRECATION_WARNINGS
- if (!s->url && !(s->url = av_strdup(s->filename))) {
-FF_ENABLE_DEPRECATION_WARNINGS
-#else
if (!s->url && !(s->url = av_strdup(""))) {
-#endif
ret = AVERROR(ENOMEM);
goto fail;
}
-#if FF_API_LAVF_AVCTX
-FF_DISABLE_DEPRECATION_WARNINGS
- if (s->nb_streams && s->streams[0]->codec->flags & AV_CODEC_FLAG_BITEXACT) {
- if (!(s->flags & AVFMT_FLAG_BITEXACT)) {
- av_log(s, AV_LOG_WARNING,
- "The AVFormatContext is not in set to bitexact mode, only "
- "the AVCodecContext. If this is not intended, set "
- "AVFormatContext.flags |= AVFMT_FLAG_BITEXACT.\n");
- }
- }
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
// some sanity checks
if (s->nb_streams == 0 && !(of->flags & AVFMT_NOSTREAMS)) {
av_log(s, AV_LOG_ERROR, "No streams to mux were specified\n");
st = s->streams[i];
par = st->codecpar;
-#if FF_API_LAVF_AVCTX
-FF_DISABLE_DEPRECATION_WARNINGS
- if (st->codecpar->codec_type == AVMEDIA_TYPE_UNKNOWN &&
- st->codec->codec_type != AVMEDIA_TYPE_UNKNOWN) {
- av_log(s, AV_LOG_WARNING, "Using AVStream.codec to pass codec "
- "parameters to muxers is deprecated, use AVStream.codecpar "
- "instead.\n");
- ret = avcodec_parameters_from_context(st->codecpar, st->codec);
- if (ret < 0)
- goto fail;
- }
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
-
if (!st->time_base.num) {
/* fall back on the default timebase values */
if (par->codec_type == AVMEDIA_TYPE_AUDIO && par->sample_rate)
#define AV_PKT_FLAG_UNCODED_FRAME 0x2000
-#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX
+#if FF_API_COMPUTE_PKT_FIELDS2
FF_DISABLE_DEPRECATION_WARNINGS
//FIXME merge with compute_pkt_fields
static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket *pkt)
case AVMEDIA_TYPE_AUDIO:
frame_size = (pkt->flags & AV_PKT_FLAG_UNCODED_FRAME) ?
(*(AVFrame **)pkt->data)->nb_samples :
- av_get_audio_frame_duration(st->codec, pkt->size);
+ av_get_audio_frame_duration2(st->codecpar, pkt->size);
/* HACK/FIXME, we skip the initial 0 size packets as they are most
* likely equal to the encoder delay, but it would be better if we
static int prepare_input_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt)
{
-#if !FF_API_COMPUTE_PKT_FIELDS2 || !FF_API_LAVF_AVCTX
+#if !FF_API_COMPUTE_PKT_FIELDS2
/* sanitize the timestamps */
if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) {
guess_pkt_duration(s, st, pkt);
-#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX
+#if FF_API_COMPUTE_PKT_FIELDS2
if ((ret = compute_muxer_pkt_fields(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
return ret;
#endif