mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/ffmpeg/gstffmpeg.c: Cut off double \n.

Browse source 
Original commit message from CVS:
* ext/ffmpeg/gstffmpeg.c: (gst_ffmpeg_log_callback):
Cut off double \n.
* ext/ffmpeg/gstffmpegcodecmap.c:
(gst_ffmpeg_formatid_get_codecids):
Enable more codecs in containers.
This commit is contained in:
Stefan Kost 2007-06-19 14:14:29 +00:00
parent 0f7713f1a8
commit 603caa3479
3 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2007-06-19 Stefan Kost <ensonic@users.sf.net>
* ext/ffmpeg/gstffmpeg.c: (gst_ffmpeg_log_callback):
Cut off double \n.
* ext/ffmpeg/gstffmpegcodecmap.c:
(gst_ffmpeg_formatid_get_codecids):
Enable more codecs in containers.
2007-06-15 Jan Schmidt <thaytan@mad.scientist.com> 2007-06-15 Jan Schmidt <thaytan@mad.scientist.com>
* win32/vs6/gst_ffmpeg.dsw: * win32/vs6/gst_ffmpeg.dsw:

14
ext/ffmpeg/gstffmpeg.c
View file

@ -24,6 +24,8 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#include <stdio.h>
#include <string.h>
#include <gst/gst.h> #include <gst/gst.h>
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h> #include <avcodec.h>
@ -79,6 +81,8 @@ static void
gst_ffmpeg_log_callback (void * ptr, int level, const char * fmt, va_list vl) gst_ffmpeg_log_callback (void * ptr, int level, const char * fmt, va_list vl)
{ {
GstDebugLevel gst_level; GstDebugLevel gst_level;
gint len = strlen (fmt);
gchar *fmt2 = NULL;
if (_shut_up_I_am_probing) if (_shut_up_I_am_probing)
return; return;
@ -101,7 +105,15 @@ gst_ffmpeg_log_callback (void * ptr, int level, const char * fmt, va_list vl)
break; break;
} }
gst_debug_log_valist (ffmpeg_debug, gst_level, "", "", 0, NULL, fmt, vl); /* remove trailing newline as it gets already appended by the logger */
if (fmt[len-1] == '\n') {
fmt2 = g_strdup (fmt);
fmt2[len-1] = '\0';
}
gst_debug_log_valist (ffmpeg_debug, gst_level, "", "", 0, NULL, fmt2?fmt2:fmt, vl);
g_free(fmt2);
} }
#endif #endif

8
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -1766,7 +1766,7 @@ gst_ffmpeg_formatid_get_codecids (const gchar * format_name,
if (!strcmp (format_name, "mp4")) { if (!strcmp (format_name, "mp4")) {
static enum CodecID mp4_video_list[] = { static enum CodecID mp4_video_list[] = {
CODEC_ID_MPEG4, CODEC_ID_H264, CODEC_ID_NONE CODEC_ID_MPEG4, CODEC_ID_H263, CODEC_ID_H264, CODEC_ID_NONE
}; };
static enum CodecID mp4_audio_list[] = { static enum CodecID mp4_audio_list[] = {
CODEC_ID_AAC, CODEC_ID_MP3, CODEC_ID_AMR_NB, CODEC_ID_AMR_WB, CODEC_ID_AAC, CODEC_ID_MP3, CODEC_ID_AMR_NB, CODEC_ID_AMR_WB,
@ -1852,12 +1852,12 @@ gst_ffmpeg_formatid_get_codecids (const gchar * format_name,
*audio_codec_list = mov_audio_list; *audio_codec_list = mov_audio_list;
} else if ((!strcmp (format_name, "3gp") || !strcmp (format_name, "3g2"))) { } else if ((!strcmp (format_name, "3gp") || !strcmp (format_name, "3g2"))) {
static enum CodecID tgp_video_list[] = { static enum CodecID tgp_video_list[] = {
CODEC_ID_H263, CODEC_ID_MPEG4, CODEC_ID_H263, CODEC_ID_H264,
CODEC_ID_NONE CODEC_ID_NONE
}; };
static enum CodecID tgp_audio_list[] = { static enum CodecID tgp_audio_list[] = {
CODEC_ID_AMR_NB, CODEC_ID_AMR_NB, CODEC_ID_AMR_WB,
CODEC_ID_AMR_WB, CODEC_ID_AAC,
CODEC_ID_NONE CODEC_ID_NONE
}; };