mirror of https://git.videolan.org/git/ffmpeg.git
ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
00dcb10631
commit
758f929d21
2
ffmpeg.h
2
ffmpeg.h
|
@ -503,7 +503,7 @@ void assert_avoptions(AVDictionary *m);
|
||||||
|
|
||||||
int guess_input_channel_layout(InputStream *ist);
|
int guess_input_channel_layout(InputStream *ist);
|
||||||
|
|
||||||
enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodec *codec, enum AVPixelFormat target);
|
enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *avctx, AVCodec *codec, enum AVPixelFormat target);
|
||||||
void choose_sample_fmt(AVStream *st, AVCodec *codec);
|
void choose_sample_fmt(AVStream *st, AVCodec *codec);
|
||||||
|
|
||||||
int configure_filtergraph(FilterGraph *fg);
|
int configure_filtergraph(FilterGraph *fg);
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
#include "libavutil/imgutils.h"
|
#include "libavutil/imgutils.h"
|
||||||
#include "libavutil/samplefmt.h"
|
#include "libavutil/samplefmt.h"
|
||||||
|
|
||||||
enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodec *codec, enum AVPixelFormat target)
|
enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, AVCodec *codec, enum AVPixelFormat target)
|
||||||
{
|
{
|
||||||
if (codec && codec->pix_fmts) {
|
if (codec && codec->pix_fmts) {
|
||||||
const enum AVPixelFormat *p = codec->pix_fmts;
|
const enum AVPixelFormat *p = codec->pix_fmts;
|
||||||
|
@ -50,10 +50,10 @@ enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodec *codec, enum AVPixelFo
|
||||||
{ AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUV420P,
|
{ AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUV420P,
|
||||||
AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_BGRA, AV_PIX_FMT_NONE };
|
AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_BGRA, AV_PIX_FMT_NONE };
|
||||||
|
|
||||||
if (st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) {
|
if (enc_ctx->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) {
|
||||||
if (st->codec->codec_id == AV_CODEC_ID_MJPEG) {
|
if (enc_ctx->codec_id == AV_CODEC_ID_MJPEG) {
|
||||||
p = mjpeg_formats;
|
p = mjpeg_formats;
|
||||||
} else if (st->codec->codec_id == AV_CODEC_ID_LJPEG) {
|
} else if (enc_ctx->codec_id == AV_CODEC_ID_LJPEG) {
|
||||||
p =ljpeg_formats;
|
p =ljpeg_formats;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -113,7 +113,7 @@ static char *choose_pix_fmts(OutputStream *ost)
|
||||||
return av_strdup(av_get_pix_fmt_name(ost->enc_ctx->pix_fmt));
|
return av_strdup(av_get_pix_fmt_name(ost->enc_ctx->pix_fmt));
|
||||||
}
|
}
|
||||||
if (ost->enc_ctx->pix_fmt != AV_PIX_FMT_NONE) {
|
if (ost->enc_ctx->pix_fmt != AV_PIX_FMT_NONE) {
|
||||||
return av_strdup(av_get_pix_fmt_name(choose_pixel_fmt(ost->st, ost->enc, ost->enc_ctx->pix_fmt)));
|
return av_strdup(av_get_pix_fmt_name(choose_pixel_fmt(ost->st, ost->enc_ctx, ost->enc, ost->enc_ctx->pix_fmt)));
|
||||||
} else if (ost->enc && ost->enc->pix_fmts) {
|
} else if (ost->enc && ost->enc->pix_fmts) {
|
||||||
const enum AVPixelFormat *p;
|
const enum AVPixelFormat *p;
|
||||||
AVIOContext *s = NULL;
|
AVIOContext *s = NULL;
|
||||||
|
|
|
@ -1631,7 +1631,7 @@ static int read_ffserver_streams(OptionsContext *o, AVFormatContext *s, const ch
|
||||||
if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && !ost->stream_copy)
|
if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && !ost->stream_copy)
|
||||||
choose_sample_fmt(st, codec);
|
choose_sample_fmt(st, codec);
|
||||||
else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && !ost->stream_copy)
|
else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && !ost->stream_copy)
|
||||||
choose_pixel_fmt(st, codec, st->codec->pix_fmt);
|
choose_pixel_fmt(st, st->codec, codec, st->codec->pix_fmt);
|
||||||
}
|
}
|
||||||
|
|
||||||
avformat_close_input(&ic);
|
avformat_close_input(&ic);
|
||||||
|
|
Loading…
Reference in New Issue