diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-02 01:15:06 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-01-02 02:20:53 +0100 |
| commit | bc1e72c38ead1d3c71a99d714ef68894b8dffd0a (patch) | |
| tree | ccc91173cac6db222ecebef48d2bf4d046f01ac3 /libavformat/utils.c | |
| parent | 20c121c00747d6c3b0b0f98deeff021171b2ed74 (diff) | |
| download | ffmpeg-bc1e72c38ead1d3c71a99d714ef68894b8dffd0a.tar.gz | |
lavf: move force_codec_ids() up
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3a6b6f425ee3f552eaaf6bde7480be5cb38aba1d)
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index be73c4acb7..eab0792ea1 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -676,6 +676,21 @@ fail: /*******************************************************/ +static void force_codec_ids(AVFormatContext *s, AVStream *st) +{ + switch(st->codec->codec_type){ + case AVMEDIA_TYPE_VIDEO: + if(s->video_codec_id) st->codec->codec_id= s->video_codec_id; + break; + case AVMEDIA_TYPE_AUDIO: + if(s->audio_codec_id) st->codec->codec_id= s->audio_codec_id; + break; + case AVMEDIA_TYPE_SUBTITLE: + if(s->subtitle_codec_id)st->codec->codec_id= s->subtitle_codec_id; + break; + } +} + static void probe_codec(AVFormatContext *s, AVStream *st, const AVPacket *pkt) { if(st->request_probe>0){ @@ -720,21 +735,6 @@ no_packet: } } -static void force_codec_ids(AVFormatContext *s, AVStream *st) -{ - switch(st->codec->codec_type){ - case AVMEDIA_TYPE_VIDEO: - if(s->video_codec_id) st->codec->codec_id= s->video_codec_id; - break; - case AVMEDIA_TYPE_AUDIO: - if(s->audio_codec_id) st->codec->codec_id= s->audio_codec_id; - break; - case AVMEDIA_TYPE_SUBTITLE: - if(s->subtitle_codec_id)st->codec->codec_id= s->subtitle_codec_id; - break; - } -} - int ff_read_packet(AVFormatContext *s, AVPacket *pkt) { int ret, i; |