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/avformat.h | |
| parent | f7f5370b4b413c05f6ed848bffb85d28c5f44b9c (diff) | |
| parent | fd41cb43702498948ff14ba8c284fd5c15fc729d (diff) | |
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/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 4 |
1 files changed, 2 insertions, 2 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. |