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

Merge commit '8575f5362f98c937758b20ff8512d6767a56208e' into release/1.1

Browse Source 
* commit '8575f5362f98c937758b20ff8512d6767a56208e':
  lavf: make av_probe_input_buffer more robust
  lavf: use a fixed width type
  lavf: simplify handling of offset in av_probe_input_buffer()

Conflicts:
	libavformat/utils.c

See: cdce0e8a50 and previous commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-02-04 05:17:38 +01:00
parent c06f8bac20 8575f5362f
commit 35bf91c5b5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/utils.c
View File

@@ -433,7 +433,7 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
unsigned int offset, unsigned int max_probe_size) unsigned int offset, unsigned int max_probe_size)
{ {
AVProbeData pd = { filename ? filename : "", NULL, -offset }; AVProbeData pd = { filename ? filename : "", NULL, -offset };
unsigned char *buf = NULL; uint8_t *buf = NULL;
uint8_t *mime_type; uint8_t *mime_type;
int ret = 0, probe_size, buf_offset = 0; int ret = 0, probe_size, buf_offset = 0;
int score = 0; int score = 0;