|
|
@@ -151,6 +151,7 @@ static int frame_height = 0; |
|
|
|
static float frame_aspect_ratio = 0; |
|
|
|
static int frame_aspect_ratio_override = 0; |
|
|
|
static enum PixelFormat frame_pix_fmt = PIX_FMT_NONE; |
|
|
|
static int frame_bits_per_raw_sample = 0; |
|
|
|
static enum AVSampleFormat audio_sample_fmt = AV_SAMPLE_FMT_NONE; |
|
|
|
static int max_frames[4] = {INT_MAX, INT_MAX, INT_MAX, INT_MAX}; |
|
|
|
static AVRational frame_rate; |
|
|
@@ -2288,7 +2289,7 @@ static int transcode(AVFormatContext **output_files, |
|
|
|
ost->original_height = icodec->height; |
|
|
|
ost->original_width = icodec->width; |
|
|
|
#endif |
|
|
|
codec->bits_per_raw_sample= 0; |
|
|
|
codec->bits_per_raw_sample= frame_bits_per_raw_sample; |
|
|
|
} |
|
|
|
ost->resample_height = icodec->height; |
|
|
|
ost->resample_width = icodec->width; |
|
|
@@ -3516,6 +3517,7 @@ static void new_video_stream(AVFormatContext *oc, int file_idx) |
|
|
|
video_enc->height = frame_height; |
|
|
|
video_enc->sample_aspect_ratio = av_d2q(frame_aspect_ratio*video_enc->height/video_enc->width, 255); |
|
|
|
video_enc->pix_fmt = frame_pix_fmt; |
|
|
|
video_enc->bits_per_raw_sample = frame_bits_per_raw_sample; |
|
|
|
st->sample_aspect_ratio = video_enc->sample_aspect_ratio; |
|
|
|
|
|
|
|
choose_pixel_fmt(st, codec); |
|
|
@@ -4315,6 +4317,7 @@ static const OptionDef options[] = { |
|
|
|
{ "s", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_size}, "set frame size (WxH or abbreviation)", "size" }, |
|
|
|
{ "aspect", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_aspect_ratio}, "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" }, |
|
|
|
{ "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_frame_pix_fmt}, "set pixel format, 'list' as argument shows all the pixel formats supported", "format" }, |
|
|
|
{ "bits_per_raw_sample", OPT_INT | HAS_ARG | OPT_VIDEO, {(void*)&frame_bits_per_raw_sample}, "set the number of bits per raw sample", "number" }, |
|
|
|
{ "croptop", OPT_FUNC2 | HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" }, |
|
|
|
{ "cropbottom", OPT_FUNC2 | HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" }, |
|
|
|
{ "cropleft", OPT_FUNC2 | HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" }, |
|
|
|