Mercurial > libavformat.hg

comparison utils.c @ 5696:bbe5b963f736 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure mp1/mp2 get their frame_size set. Fixes issue1696
author michael
date Mon, 22 Feb 2010 22:05:20 +0000
parents 7b939c780afc
children c9466f118684
comparison
equal deleted inserted replaced
5695:25062326d2f9 5696:bbe5b963f736
1912 case CODEC_TYPE_AUDIO: 1912 case CODEC_TYPE_AUDIO:
1913 val = enc->sample_rate && enc->channels && enc->sample_fmt != SAMPLE_FMT_NONE; 1913 val = enc->sample_rate && enc->channels && enc->sample_fmt != SAMPLE_FMT_NONE;
1914 if(!enc->frame_size && 1914 if(!enc->frame_size &&
1915 (enc->codec_id == CODEC_ID_VORBIS || 1915 (enc->codec_id == CODEC_ID_VORBIS ||
1916 enc->codec_id == CODEC_ID_AAC || 1916 enc->codec_id == CODEC_ID_AAC ||
1917 enc->codec_id == CODEC_ID_MP1 ||
1918 enc->codec_id == CODEC_ID_MP2 ||
1917 enc->codec_id == CODEC_ID_MP3 || 1919 enc->codec_id == CODEC_ID_MP3 ||
1918 enc->codec_id == CODEC_ID_SPEEX)) 1920 enc->codec_id == CODEC_ID_SPEEX))
1919 return 0; 1921 return 0;
1920 break; 1922 break;
1921 case CODEC_TYPE_VIDEO: 1923 case CODEC_TYPE_VIDEO: