#include "libavfilter/buffersink.h"
#include "libavfilter/buffersrc.h"
-#include "libavresample/avresample.h"
-
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
// FIXME: YUV420P etc. are actually supported with full color range,
// yet the latter information isn't available here.
-static const enum AVPixelFormat *get_compliance_normal_pix_fmts(enum AVCodecID codec_id, const enum AVPixelFormat default_formats[])
+static const enum AVPixelFormat *get_compliance_normal_pix_fmts(const AVCodec *codec, const enum AVPixelFormat default_formats[])
{
static const enum AVPixelFormat mjpeg_formats[] =
{ AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P,
AV_PIX_FMT_NONE };
- if (codec_id == AV_CODEC_ID_MJPEG) {
+ if (!strcmp(codec->name, "mjpeg")) {
return mjpeg_formats;
} else {
return default_formats;
enum AVPixelFormat best= AV_PIX_FMT_NONE;
if (enc_ctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
- p = get_compliance_normal_pix_fmts(enc_ctx->codec_id, p);
+ p = get_compliance_normal_pix_fmts(codec, p);
}
for (; *p != AV_PIX_FMT_NONE; p++) {
best = av_find_best_pix_fmt_of_2(best, *p, target, has_alpha, NULL);
p = ost->enc->pix_fmts;
if (ost->enc_ctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
- p = get_compliance_normal_pix_fmts(ost->enc_ctx->codec_id, p);
+ p = get_compliance_normal_pix_fmts(ost->enc, p);
}
for (; *p != AV_PIX_FMT_NONE; p++) {
}
if (ost->apad && of->shortest) {
- char args[256];
int i;
for (i=0; i<of->ctx->nb_streams; i++)
break;
if (i<of->ctx->nb_streams) {
- snprintf(args, sizeof(args), "%s", ost->apad);
- AUTO_INSERT_FILTER("-apad", "apad", args);
+ AUTO_INSERT_FILTER("-apad", "apad", ost->apad);
}
}