diff options
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 0073a3692ee..7a8fd2dc43b 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -249,7 +249,7 @@ static int write_audio_frame(FFMpegContext *context) return 0; } -# endif // #ifdef WITH_AUDASPACE +# endif /* #ifdef WITH_AUDASPACE */ /* Allocate a temporary frame */ static AVFrame *alloc_picture(int pix_fmt, int width, int height) @@ -878,9 +878,9 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, # endif if (c->frame_size == 0) { - // used to be if ((c->codec_id >= CODEC_ID_PCM_S16LE) && (c->codec_id <= CODEC_ID_PCM_DVD)) - // not sure if that is needed anymore, so let's try out if there are any - // complaints regarding some ffmpeg versions users might have + /* Used to be if ((c->codec_id >= CODEC_ID_PCM_S16LE) && (c->codec_id <= CODEC_ID_PCM_DVD)) + * not sure if that is needed anymore, so let's try out if there are any + * complaints regarding some FFmpeg versions users might have. */ context->audio_input_samples = FF_MIN_BUFFER_SIZE * 8 / c->bits_per_coded_sample / c->channels; } else { @@ -1675,9 +1675,9 @@ static void ffmpeg_set_expert_options(RenderData *rd) /* This breaks compatibility for QT. */ // BKE_ffmpeg_property_add_string(rd, "video", "flags:loop"); BKE_ffmpeg_property_add_string(rd, "video", "cmp:chroma"); - BKE_ffmpeg_property_add_string(rd, "video", "partitions:parti4x4"); // Deprecated. - BKE_ffmpeg_property_add_string(rd, "video", "partitions:partp8x8"); // Deprecated. - BKE_ffmpeg_property_add_string(rd, "video", "partitions:partb8x8"); // Deprecated. + BKE_ffmpeg_property_add_string(rd, "video", "partitions:parti4x4"); /* Deprecated. */ + BKE_ffmpeg_property_add_string(rd, "video", "partitions:partp8x8"); /* Deprecated. */ + BKE_ffmpeg_property_add_string(rd, "video", "partitions:partb8x8"); /* Deprecated. */ BKE_ffmpeg_property_add_string(rd, "video", "me:hex"); BKE_ffmpeg_property_add_string(rd, "video", "subq:6"); BKE_ffmpeg_property_add_string(rd, "video", "me_range:16"); @@ -1787,7 +1787,7 @@ void BKE_ffmpeg_preset_set(RenderData *rd, int preset) rd->ffcodecdata.codec = AV_CODEC_ID_MPEG4; } else if (preset == FFMPEG_PRESET_THEORA) { - rd->ffcodecdata.type = FFMPEG_OGG; // XXX broken + rd->ffcodecdata.type = FFMPEG_OGG; /* XXX broken */ rd->ffcodecdata.codec = AV_CODEC_ID_THEORA; } |