OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
48e3cd4
5d8cae4
)
Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 24 Feb 2015 21:55:14 +0000
(22:55 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 24 Feb 2015 21:55:20 +0000
(22:55 +0100)
* commit '
5d8cae45737bed6239bd6b6e0698802dbe1463c8
':
rtpdec: Get rid of all trivial .alloc/.free functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
18 files changed:
1
2
libavformat/rtpdec_ac3.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_amr.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_asf.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_dv.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_h261.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_h263_rfc2190.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_h264.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_hevc.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_jpeg.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_latm.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_mpa_robust.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_mpeg4.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_mpegts.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_qcelp.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_qdm2.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_qt.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_svq3.c
patch
|
diff1
|
diff2
|
blob
|
history
libavformat/rtpdec_xiph.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libavformat/rtpdec_ac3.c
Simple merge
diff --cc
libavformat/rtpdec_amr.c
Simple merge
diff --cc
libavformat/rtpdec_asf.c
Simple merge
diff --cc
libavformat/rtpdec_dv.c
Simple merge
diff --cc
libavformat/rtpdec_h261.c
Simple merge
diff --cc
libavformat/rtpdec_h263_rfc2190.c
Simple merge
diff --cc
libavformat/rtpdec_h264.c
Simple merge
diff --cc
libavformat/rtpdec_hevc.c
Simple merge
diff --cc
libavformat/rtpdec_jpeg.c
Simple merge
diff --cc
libavformat/rtpdec_latm.c
Simple merge
diff --cc
libavformat/rtpdec_mpa_robust.c
Simple merge
diff --cc
libavformat/rtpdec_mpeg4.c
index
da58c03
,
4a0593b
..
27184d9
---
1
/
libavformat/rtpdec_mpeg4.c
---
2
/
libavformat/rtpdec_mpeg4.c
+++ b/
libavformat/rtpdec_mpeg4.c
@@@
-91,16
-91,11
+91,11
@@@
static const AttrNameMap attr_names[]
{ NULL, -1, -1 },
};
- static PayloadContext *new_context(void)
- {
- return av_mallocz(sizeof(PayloadContext));
- }
-
static void free_context(PayloadContext *data)
{
- av_free
(
data->au_headers);
- av_free
(
data->mode);
- av_free
(
data);
+ av_free
p(&
data->au_headers);
+ av_free
p(&
data->mode);
+ av_free
p(&
data);
}
static int parse_fmtp_config(AVCodecContext *codec, char *value)
diff --cc
libavformat/rtpdec_mpegts.c
Simple merge
diff --cc
libavformat/rtpdec_qcelp.c
Simple merge
diff --cc
libavformat/rtpdec_qdm2.c
Simple merge
diff --cc
libavformat/rtpdec_qt.c
Simple merge
diff --cc
libavformat/rtpdec_svq3.c
Simple merge
diff --cc
libavformat/rtpdec_xiph.c
Simple merge