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.3~trusty1
[deb_ffmpeg.git]
/
ffmpeg
/
libavformat
/
utils.c
diff --git
a/ffmpeg/libavformat/utils.c
b/ffmpeg/libavformat/utils.c
index ae6347a49f7a13d7b371d6706407a983abdd714f..5a282a7ce79b56767be2d4bb1bc1ea4d3576c1be 100644
(file)
--- a/
ffmpeg/libavformat/utils.c
+++ b/
ffmpeg/libavformat/utils.c
@@
-53,6
+53,9
@@
#include "riff.h"
#include "url.h"
#include "riff.h"
#include "url.h"
+#include "libavutil/ffversion.h"
+const char av_format_ffversion[] = "FFmpeg version " FFMPEG_VERSION;
+
/**
* @file
* various utility functions for use within FFmpeg
/**
* @file
* various utility functions for use within FFmpeg
@@
-2826,6
+2829,7
@@
int ff_alloc_extradata(AVCodecContext *avctx, int size)
int ret;
if (size < 0 || size >= INT32_MAX - FF_INPUT_BUFFER_PADDING_SIZE) {
int ret;
if (size < 0 || size >= INT32_MAX - FF_INPUT_BUFFER_PADDING_SIZE) {
+ avctx->extradata = NULL;
avctx->extradata_size = 0;
return AVERROR(EINVAL);
}
avctx->extradata_size = 0;
return AVERROR(EINVAL);
}