diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 14:38:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 14:58:19 +0200 |
| commit | 82db8ee3211014a38db6b8cae03f1c3246938eee (patch) | |
| tree | acac8aa9b5b38bcbcb5c34a77f076adee3c28465 /libavformat | |
| parent | f7f5370b4b413c05f6ed848bffb85d28c5f44b9c (diff) | |
| parent | fd41cb43702498948ff14ba8c284fd5c15fc729d (diff) | |
| download | ffmpeg-82db8ee3211014a38db6b8cae03f1c3246938eee.tar.gz | |
Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'
* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
avconv: improve sample format negotiation for decoder request
Opus encoder using libopus
mpegts: Drop pointless casting of hex_dump_debug arguments
avformat: const correctness for av_hex_dump / av_hex_dump_log
wmadec: Adjust debug printf argument length modifier
Conflicts:
Changelog
ffmpeg.c
libavcodec/libopusdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 4 | ||||
| -rw-r--r-- | libavformat/mpegts.c | 6 | ||||
| -rw-r--r-- | libavformat/utils.c | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f7779e7808..1ee44dfd7c 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1813,7 +1813,7 @@ int av_get_output_timestamp(struct AVFormatContext *s, int stream, * * @see av_hex_dump_log, av_pkt_dump2, av_pkt_dump_log2 */ -void av_hex_dump(FILE *f, uint8_t *buf, int size); +void av_hex_dump(FILE *f, const uint8_t *buf, int size); /** * Send a nice hexadecimal dump of a buffer to the log. @@ -1827,7 +1827,7 @@ void av_hex_dump(FILE *f, uint8_t *buf, int size); * * @see av_hex_dump, av_pkt_dump2, av_pkt_dump_log2 */ -void av_hex_dump_log(void *avcl, int level, uint8_t *buf, int size); +void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size); /** * Send a nice dump of a packet to the specified file stream. diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 6316d6178e..aed3cea69c 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1414,7 +1414,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len int i; av_dlog(ts->stream, "PMT: len %i\n", section_len); - hex_dump_debug(ts->stream, (uint8_t *)section, section_len); + hex_dump_debug(ts->stream, section, section_len); p_end = section + section_len - 4; p = section; @@ -1553,7 +1553,7 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len AVProgram *program; av_dlog(ts->stream, "PAT:\n"); - hex_dump_debug(ts->stream, (uint8_t *)section, section_len); + hex_dump_debug(ts->stream, section, section_len); p_end = section + section_len - 4; p = section; @@ -1601,7 +1601,7 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len char *name, *provider_name; av_dlog(ts->stream, "SDT:\n"); - hex_dump_debug(ts->stream, (uint8_t *)section, section_len); + hex_dump_debug(ts->stream, section, section_len); p_end = section + section_len - 4; p = section; diff --git a/libavformat/utils.c b/libavformat/utils.c index b3298f8fbd..92dc6850ab 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4146,7 +4146,8 @@ int av_get_frame_filename(char *buf, int buf_size, return -1; } -static void hex_dump_internal(void *avcl, FILE *f, int level, uint8_t *buf, int size) +static void hex_dump_internal(void *avcl, FILE *f, int level, + const uint8_t *buf, int size) { int len, i, j, c; #undef fprintf @@ -4175,12 +4176,12 @@ static void hex_dump_internal(void *avcl, FILE *f, int level, uint8_t *buf, int #undef PRINT } -void av_hex_dump(FILE *f, uint8_t *buf, int size) +void av_hex_dump(FILE *f, const uint8_t *buf, int size) { hex_dump_internal(NULL, f, 0, buf, size); } -void av_hex_dump_log(void *avcl, int level, uint8_t *buf, int size) +void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size) { hex_dump_internal(avcl, NULL, level, buf, size); } |