diff options
| author | Max Kellermann <max@duempel.org> | 2012-05-29 23:46:10 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-05-29 23:46:10 +0200 |
| commit | d662c4c0cc089a6a493a7463e440f0f7e7959b48 (patch) | |
| tree | 873ae7ff1cf9b57e03c54ffb34158da54aadd184 | |
| parent | 457d98c8605c3406a2f83f8f099abe0048968efb (diff) | |
| parent | 6bb166aaaa387f20aca469b6463ba1ad96942d06 (diff) | |
Merge branch 'v0.16.x'
Conflicts:
NEWS
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | src/decoder/ffmpeg_decoder_plugin.c | 6 | ||||
| -rw-r--r-- | src/decoder_thread.c | 4 |
3 files changed, 13 insertions, 2 deletions
@@ -40,6 +40,11 @@ ver 0.17 (2011/??/??) * systemd socket activation +ver 0.16.9 (2012/??/??) +* decoder: + - ffmpeg: support WebM + + ver 0.16.8 (2012/04/04) * fix for libsamplerate assertion failure * decoder: diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index 6ad10026..b6309440 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -330,7 +330,7 @@ ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is, if (len < 0) { /* if error, we skip the frame */ - g_message("decoding failed\n"); + g_message("decoding failed, frame skipped\n"); break; } @@ -652,7 +652,8 @@ static const char *const ffmpeg_suffixes[] = { "ram", "rl2", "rm", "rmvb", "roq", "rpl", "rvc", "shn", "smk", "snd", "sol", "son", "spx", "str", "swf", "tgi", "tgq", "tgv", "thp", "ts", "tsp", "tta", "xa", "xvid", "uv", "uv2", "vb", "vid", "vob", "voc", - "vp6", "vmd", "wav", "wma", "wmv", "wsaud", "wsvga", "wv", "wve", + "vp6", "vmd", "wav", "webm", "wma", "wmv", "wsaud", "wsvga", "wv", + "wve", NULL }; @@ -716,6 +717,7 @@ static const char *const ffmpeg_mime_types[] = { "video/msvideo", "video/ogg", "video/theora", + "video/webm", "video/x-dv", "video/x-flv", "video/x-matroska", diff --git a/src/decoder_thread.c b/src/decoder_thread.c index 421efd32..1440fc27 100644 --- a/src/decoder_thread.c +++ b/src/decoder_thread.c @@ -126,6 +126,8 @@ decoder_stream_decode(const struct decoder_plugin *plugin, assert(input_stream->ready); assert(decoder->dc->state == DECODE_STATE_START); + g_debug("probing plugin %s", plugin->name); + if (decoder->dc->command == DECODE_COMMAND_STOP) return true; @@ -157,6 +159,8 @@ decoder_file_decode(const struct decoder_plugin *plugin, assert(g_path_is_absolute(path)); assert(decoder->dc->state == DECODE_STATE_START); + g_debug("probing plugin %s", plugin->name); + if (decoder->dc->command == DECODE_COMMAND_STOP) return true; |