summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-04-23 23:30:16 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-04-23 23:30:16 +0000
commita39b76ea7d98c63b83584ff761977cf41b61b314 (patch)
tree2d842dba17895fa842448a3f1dddf246fd22cb5c /ffmpeg.c
parent2e418f5ed8ed50ac971d0c3525f6fe1695caa7cb (diff)
Don't loose bits_per_raw_sample when transcoding.
Originally committed as revision 18671 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index c050512ae2..f6923c54a0 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1748,6 +1748,7 @@ static int av_encode(AVFormatContext **output_files,
av_metadata_set(&ost->st->metadata, "language", lang->value);
ost->st->disposition = ist->st->disposition;
+ codec->bits_per_raw_sample= icodec->bits_per_raw_sample;
if (ost->st->stream_copy) {
/* if stream_copy is selected, no need to decode or encode */
@@ -1857,6 +1858,7 @@ static int av_encode(AVFormatContext **output_files,
av_exit(1);
}
ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand);
+ codec->bits_per_raw_sample= 0;
}
ost->encoding_needed = 1;
ist->decoding_needed = 1;