git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
660a8b4
)
Merge commit 'f918b8a2933a65020cbe490ec637d5485c11a692'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 19 Nov 2014 19:24:06 +0000
(20:24 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 19 Nov 2014 19:24:11 +0000
(20:24 +0100)
* commit '
f918b8a2933a65020cbe490ec637d5485c11a692
':
hdsenc: Use the right filename in an error message
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/hdsenc.c
patch
|
blob
|
history
diff --git
a/libavformat/hdsenc.c
b/libavformat/hdsenc.c
index
eec9bb8
..
6ee0e73
100644
(file)
--- a/
libavformat/hdsenc.c
+++ b/
libavformat/hdsenc.c
@@
-174,7
+174,7
@@
static int write_manifest(AVFormatContext *s, int final)
ret = avio_open2(&out, temp_filename, AVIO_FLAG_WRITE,
&s->interrupt_callback, NULL);
if (ret < 0) {
- av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", filename);
+ av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n",
temp_
filename);
return ret;
}
avio_printf(out, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");