diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-02 23:53:54 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-02 23:55:13 +0300 |
| commit | d136cf68827382ad710adb74d02e50364052f430 (patch) | |
| tree | df40e0284c9275bb185bc098cc3ed039bb765692 /libmpdemux | |
| parent | cf9edda1d370d39bc8a3d020a9c2bc4090d2457e (diff) | |
| parent | 83c2df3565c19931b01c3ed75a0e08aca1fb24f2 (diff) | |
| download | mpv-d136cf68827382ad710adb74d02e50364052f430.tar.bz2 mpv-d136cf68827382ad710adb74d02e50364052f430.tar.xz | |
Merge svn changes up to r29134
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 2 | ||||
| -rw-r--r-- | libmpdemux/mp_taglists.c | 2 | ||||
| -rw-r--r-- | libmpdemux/parse_mp4.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 047315e74c..e977255fea 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -42,7 +42,7 @@ #include "mp_taglists.h" -#define PROBE_BUF_SIZE 2048 +#define PROBE_BUF_SIZE (32*1024) static unsigned int opt_probesize = 0; static unsigned int opt_analyzeduration = 0; diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 98564b5916..eda322d210 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -60,6 +60,8 @@ static const AVCodecTag mp_wav_override_tags[] = { { CODEC_ID_PCM_S16LE, 1}, { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, { CODEC_ID_PCM_S24LE, 1}, + { CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2')}, + { CODEC_ID_PCM_S32LE, 1}, { 0, 0 }, }; diff --git a/libmpdemux/parse_mp4.c b/libmpdemux/parse_mp4.c index 82b00a060c..c9f9ff2e80 100644 --- a/libmpdemux/parse_mp4.c +++ b/libmpdemux/parse_mp4.c @@ -23,9 +23,6 @@ #include <stdio.h> #include <inttypes.h> -#if HAVE_MALLOC_H -#include <malloc.h> -#endif #include <stdlib.h> #include "parse_mp4.h" #include "mp_msg.h" |