repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavformat
/
qcp.c
diff --git
a/ffmpeg/libavformat/qcp.c
b/ffmpeg/libavformat/qcp.c
index 4d42197b19348c139d0ef1744c995aa831acd145..ccfa047529a93f5d37a29d77d7c1c220bfcf5bce 100644
(file)
--- a/
ffmpeg/libavformat/qcp.c
+++ b/
ffmpeg/libavformat/qcp.c
@@
-30,6
+30,7
@@
#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
#include "avformat.h"
+#include "riff.h"
typedef struct {
uint32_t data_size; ///< size of data chunk
typedef struct {
uint32_t data_size; ///< size of data chunk
@@
-106,7
+107,8
@@
static int qcp_read_header(AVFormatContext *s)
} else if (!memcmp(buf, guid_smv, 16)) {
st->codec->codec_id = AV_CODEC_ID_SMV;
} else {
} else if (!memcmp(buf, guid_smv, 16)) {
st->codec->codec_id = AV_CODEC_ID_SMV;
} else {
- av_log(s, AV_LOG_ERROR, "Unknown codec GUID.\n");
+ av_log(s, AV_LOG_ERROR, "Unknown codec GUID "FF_PRI_GUID".\n",
+ FF_ARG_GUID(buf));
return AVERROR_INVALIDDATA;
}
avio_skip(pb, 2 + 80); // codec-version + codec-name
return AVERROR_INVALIDDATA;
}
avio_skip(pb, 2 + 80); // codec-version + codec-name