[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. af491c7fe5a2787954d1
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. af491c7fe5a2787954d1e841c5606b2a2ef208e1 |
Date: |
Mon, 06 Dec 2010 09:43:47 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via af491c7fe5a2787954d1e841c5606b2a2ef208e1 (commit)
from 17237803405cec3721b5319e40cfd55ed247b73a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=af491c7fe5a2787954d1e841c5606b2a2ef208e1
commit af491c7fe5a2787954d1e841c5606b2a2ef208e1
Author: Sandro Santilli <address@hidden>
Date: Mon Dec 6 10:43:37 2010 +0100
formatting, no functional changes
diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
index 0af7f25..36fdc7a 100644
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
@@ -380,17 +380,24 @@ MediaParserFfmpeg::initializeParser()
_byteIOCxt.is_streamed = 1;
// Open the stream. the 4th argument is the filename, which we ignore.
- if(av_open_input_stream(&_formatCtx, &_byteIOCxt, "", _inputFmt, NULL) <
0) {
- throw IOException("MediaParserFfmpeg couldn't open input stream");
+ if(av_open_input_stream(&_formatCtx, &_byteIOCxt, "", _inputFmt, NULL) < 0)
+ {
+ throw IOException("MediaParserFfmpeg couldn't open input stream");
}
- log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d",
_inputFmt->name, _formatCtx->nb_streams);
+ log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d",
+ _inputFmt->name, _formatCtx->nb_streams);
- if ( _formatCtx->title[0] ) log_debug(_(" Title:'%s'"),
_formatCtx->title);
- if ( _formatCtx->author[0] ) log_debug(_(" Author:'%s'"),
_formatCtx->author);
- if ( _formatCtx->copyright[0] ) log_debug(_(" Copyright:'%s'"),
_formatCtx->copyright);
- if ( _formatCtx->comment[0] ) log_debug(_(" Comment:'%s'"),
_formatCtx->comment);
- if ( _formatCtx->album[0] ) log_debug(_(" Album:'%s'"),
_formatCtx->album);
+ if ( _formatCtx->title[0] )
+ log_debug(_(" Title:'%s'"), _formatCtx->title);
+ if ( _formatCtx->author[0] )
+ log_debug(_(" Author:'%s'"), _formatCtx->author);
+ if ( _formatCtx->copyright[0] )
+ log_debug(_(" Copyright:'%s'"), _formatCtx->copyright);
+ if ( _formatCtx->comment[0] )
+ log_debug(_(" Comment:'%s'"), _formatCtx->comment);
+ if ( _formatCtx->album[0] )
+ log_debug(_(" Album:'%s'"), _formatCtx->album);
// Find first audio and video stream
for (unsigned int i = 0; i < static_cast<unsigned
int>(_formatCtx->nb_streams); i++)
-----------------------------------------------------------------------
Summary of changes:
libmedia/ffmpeg/MediaParserFfmpeg.cpp | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. af491c7fe5a2787954d1e841c5606b2a2ef208e1,
Sandro Santilli <=