git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b2c5f50
7effebd
)
Merge commit '7effebde78977fafce935776153ea2f7c0981fa3'
author
Clément Bœsch
<u@pkh.me>
Sun, 19 Mar 2017 15:10:17 +0000
(16:10 +0100)
committer
Clément Bœsch
<u@pkh.me>
Sun, 19 Mar 2017 15:10:17 +0000
(16:10 +0100)
* commit '
7effebde78977fafce935776153ea2f7c0981fa3
':
dvbsubdec: Remove disabled, near-duplicate debug code
Merged-by: Clément Bœsch <u@pkh.me>
1
2
libavcodec/dvbsubdec.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libavcodec/dvbsubdec.c
index
bf3b1a1
,
ccdfc01
..
7c27d69
---
1
/
libavcodec/dvbsubdec.c
---
2
/
libavcodec/dvbsubdec.c
+++ b/
libavcodec/dvbsubdec.c
@@@
-1540,9
-1204,9
+1482,9
@@@
static int save_display_set(DVBSubConte
snprintf(filename, sizeof(filename), "dvbs.%d", fileno_index);
- png_save
2
(filename, pbuf, width, height);
+ png_save(filename, pbuf, width, height);
- av_free
(
pbuf);
+ av_free
p(&
pbuf);
}
fileno_index++;