diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-27 16:23:23 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-27 16:29:03 +0400 |
| commit | e760424ddd202e01119592044394d505810ae00a (patch) | |
| tree | 448d22660a84f4516c9e1a5caeb66f9005a25a7a /libavformat/nutdec.c | |
| parent | 00e1afd83f7585f4acb65911100d79e32c1f6fc4 (diff) | |
| parent | 93e81ee81c33e74e6047053f6086d63d2f8293d4 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
nutdec: const correctness for get_v_trace/get_s_trace function arguments
truemotion2: Request samples for old TM2 headers
rtpdec: Remove a useless ff_ prefix from a static symbol
rtpdec: Support depacketizing speex
rtpenc: Add support for packetizing speex
Conflicts:
libavformat/rtpdec.c
libavformat/sdp.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutdec.c')
| -rw-r--r-- | libavformat/nutdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 31c7189020..4179fbed2e 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -77,8 +77,8 @@ static uint64_t get_fourcc(AVIOContext *bc) } #ifdef TRACE -static inline uint64_t get_v_trace(AVIOContext *bc, char *file, - char *func, int line) +static inline uint64_t get_v_trace(AVIOContext *bc, const char *file, + const char *func, int line) { uint64_t v = ffio_read_varlen(bc); @@ -87,8 +87,8 @@ static inline uint64_t get_v_trace(AVIOContext *bc, char *file, return v; } -static inline int64_t get_s_trace(AVIOContext *bc, char *file, - char *func, int line) +static inline int64_t get_s_trace(AVIOContext *bc, const char *file, + const char *func, int line) { int64_t v = get_s(bc); |