diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-29 16:28:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-29 17:07:26 +0100 |
| commit | bcd5fd5346be263162792be595eff9fc08e5c853 (patch) | |
| tree | b832637e5bce2a8906f5e1802fb3906612c25a27 /tools/uncoded_frame.c | |
| parent | 8a9d0a1561470a185a3d09676fcf9b44830a4bfe (diff) | |
| parent | 3937b40e87c92993df6c62492c59f59cbeb97126 (diff) | |
| download | ffmpeg-bcd5fd5346be263162792be595eff9fc08e5c853.tar.gz | |
Merge commit 'lukaszmluki/master^'
* commit 'lukaszmluki/master^':
lavd/pulse_audio_enc: implement get_device_list callback
lavd/pulse_audio_dec: implement get_device_list callback
lavd/pulse_audio_common: add device detecting code
lavu/mem: add av_dynarray_add_nofree function
lavd/pulse_audio_enc: implement write_uncoded_frame callback
tools/uncoded_frame: fix audio codec generation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/uncoded_frame.c')
| -rw-r--r-- | tools/uncoded_frame.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/uncoded_frame.c b/tools/uncoded_frame.c index eafbbfde17..53e71eacbf 100644 --- a/tools/uncoded_frame.c +++ b/tools/uncoded_frame.c @@ -177,12 +177,12 @@ int main(int argc, char **argv) st->stream->codec->pix_fmt = st->link->format; break; case AVMEDIA_TYPE_AUDIO: - st->stream->codec->codec_id = - av_get_pcm_codec(st->stream->codec->sample_fmt, -1); st->stream->codec->channel_layout = st->link->channel_layout; st->stream->codec->channels = avfilter_link_get_channels(st->link); st->stream->codec->sample_rate = st->link->sample_rate; st->stream->codec->sample_fmt = st->link->format; + st->stream->codec->codec_id = + av_get_pcm_codec(st->stream->codec->sample_fmt, -1); break; default: av_assert0(!"reached"); |