diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-07-12 19:56:25 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-07-12 19:56:25 +0000 |
| commit | 312d24d5e9b94a8c4363d3830ab328022064f19d (patch) | |
| tree | 0975d142916c37e0c3dcc9d326122a63e0695567 /libavformat/utils.c | |
| parent | 010acd8ea17468e60f43db610b49024941b91b6b (diff) | |
| download | ffmpeg-312d24d5e9b94a8c4363d3830ab328022064f19d.tar.gz | |
Add mpegvideo and H.264 to the codec probe.
Originally committed as revision 14187 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index eafeef9afa..9f573d61c5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -303,6 +303,10 @@ static int set_codec_from_probe_data(AVStream *st, AVProbeData *pd, int score) st->codec->codec_id = CODEC_ID_MP3; else if (strncmp(fmt->name, "ac3", 3) == 0) st->codec->codec_id = CODEC_ID_AC3; + else if (!strcmp(fmt->name, "mpegvideo")) + st->codec->codec_id = CODEC_ID_MPEG2VIDEO; + else if (!strcmp(fmt->name, "h264")) + st->codec->codec_id = CODEC_ID_H264; } return !!fmt; } |