generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-10-02 14:38:01 +02:00
parent f7f5370b4b fd41cb4370
commit 82db8ee321
14 changed files with 518 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/utils.c
View File

@@ -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);
}