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/mpegts.c | |
| 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/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |