summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorRoman Shaposhnik <roman@shaposhnik.org>2003-04-29 01:51:38 +0000
committerRoman Shaposhnik <roman@shaposhnik.org>2003-04-29 01:51:38 +0000
commit880e8ba7307de38daa2644a7ae054e3156f0ab22 (patch)
tree6277032d0d91233a7cc4eebe291e0a23ca4f3f6c /ffmpeg.c
parentcfcff6368572ed9ae3d7b6b428b1ff58fbcc2507 (diff)
downloadffmpeg-streaming-880e8ba7307de38daa2644a7ae054e3156f0ab22.zip
ffmpeg-streaming-880e8ba7307de38daa2644a7ae054e3156f0ab22.tar.gz
* fixing NTSC frame rate for DV streams
* let ffmpeg preserve 'aspect_ratio' for recoding. Do we want to make it tweakable from the command line ? Originally committed as revision 1827 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index b24de88..a004ab8 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -88,6 +88,7 @@ static AVOutputFormat *file_oformat;
static AVImageFormat *image_format;
static int frame_width = 160;
static int frame_height = 128;
+static float frame_aspect_ratio = 0;
static int frame_topBand = 0;
static int frame_bottomBand = 0;
static int frame_leftBand = 0;
@@ -2015,6 +2016,7 @@ static void opt_input_file(const char *filename)
case CODEC_TYPE_VIDEO:
frame_height = enc->height;
frame_width = enc->width;
+ frame_aspect_ratio = enc->aspect_ratio;
rfps = ic->streams[i]->r_frame_rate;
rfps_base = ic->streams[i]->r_frame_rate_base;
enc->workaround_bugs = workaround_bugs;
@@ -2171,6 +2173,7 @@ static void opt_output_file(const char *filename)
video_enc->width = frame_width;
video_enc->height = frame_height;
+ video_enc->aspect_ratio = frame_aspect_ratio;
if (!intra_only)
video_enc->gop_size = gop_size;
OpenPOWER on IntegriCloud