diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:07:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:15:37 +0300 |
| commit | 267a3f4c9c00848f32c341595d2d831157a79bee (patch) | |
| tree | cdef15bb746e3a41b1813076f24035fcc8385c30 /etc/codecs.conf | |
| parent | 5484215d044522bcd30516e458e421f403ca8e35 (diff) | |
| parent | 96fa9c4e249e9467f21e32191882e511e762fb1f (diff) | |
| download | mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.bz2 mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.xz | |
Merge svn changes up to r26680
Conflicts:
Makefile
configure
osdep/timer-darwin.c
Diffstat (limited to 'etc/codecs.conf')
| -rw-r--r-- | etc/codecs.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 0ce6f6d016..0d51cdd853 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2796,6 +2796,7 @@ audiocodec faad info "FAAD AAC (MPEG-2/MPEG-4 Audio) decoder" status working fourcc mp4a,MP4A + fourcc "VLB " ; Used in NSV, not really working fourcc "AAC " ; Used in NSV fourcc "AACP" ; Used in NSV for AACPlus format 0xff |