Browse Source

Indent

Originally committed as revision 21359 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Måns Rullgård 16 years ago
parent
commit
40ccc754e9
2 changed files with 4 additions and 4 deletions
  1. +3
    -3
      ffmpeg.c
  2. +1
    -1
      ffplay.c

+ 3
- 3
ffmpeg.c View File

@@ -2931,7 +2931,7 @@ static void opt_input_file(const char *filename)
for(i=0;i<ic->nb_streams;i++) {
AVStream *st = ic->streams[i];
AVCodecContext *enc = st->codec;
avcodec_thread_init(enc, thread_count);
avcodec_thread_init(enc, thread_count);
switch(enc->codec_type) {
case CODEC_TYPE_AUDIO:
set_context_opts(enc, avcodec_opts[CODEC_TYPE_AUDIO], AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM);
@@ -3065,7 +3065,7 @@ static void new_video_stream(AVFormatContext *oc)
bitstream_filters[nb_output_files][oc->nb_streams - 1]= video_bitstream_filters;
video_bitstream_filters= NULL;

avcodec_thread_init(st->codec, thread_count);
avcodec_thread_init(st->codec, thread_count);

video_enc = st->codec;

@@ -3210,7 +3210,7 @@ static void new_audio_stream(AVFormatContext *oc)
bitstream_filters[nb_output_files][oc->nb_streams - 1]= audio_bitstream_filters;
audio_bitstream_filters= NULL;

avcodec_thread_init(st->codec, thread_count);
avcodec_thread_init(st->codec, thread_count);

audio_enc = st->codec;
audio_enc->codec_type = CODEC_TYPE_AUDIO;


+ 1
- 1
ffplay.c View File

@@ -1722,7 +1722,7 @@ static int stream_component_open(VideoState *is, int stream_index)
enc->skip_loop_filter= skip_loop_filter;
enc->error_recognition= error_recognition;
enc->error_concealment= error_concealment;
avcodec_thread_init(enc, thread_count);
avcodec_thread_init(enc, thread_count);

set_context_opts(enc, avcodec_opts[enc->codec_type], 0);



Loading…
Cancel
Save