diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-29 06:11:02 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-29 06:11:02 +0200 |
| commit | ed333bb31dd62030f62c534277f144e7da318194 (patch) | |
| tree | 34e67542a3f9e32f399f231b11c7d2c09da722c2 /etc | |
| parent | 5017d713b1765048cf97d9ef73518ece826e9306 (diff) | |
| parent | b2adf9d98d8f59162ffcfdcd254e8626aacbec18 (diff) | |
| download | mpv-ed333bb31dd62030f62c534277f144e7da318194.tar.bz2 mpv-ed333bb31dd62030f62c534277f144e7da318194.tar.xz | |
Merge svn changes up to r29971
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 1 | ||||
| -rw-r--r-- | etc/example.conf | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index ac3dc06aca..49faf25322 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3929,6 +3929,7 @@ audiocodec ffac3 format 0x2000 format 0x332D6361 ; ac-3 in mp4 format 0x332D4341 + format 0x20736D ; "ms\20" older ac3 fcc (MOV files) fourcc dnet fourcc sac3 driver ffmpeg diff --git a/etc/example.conf b/etc/example.conf index 5f94437db9..a0fec86eb0 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -91,6 +91,10 @@ # Fixes playback when playlist and media file use the same URL. #user-agent=NSPlayer/4.1.0.3856 +# Pretend to be Quicktime +# Fixes playback for apple.com/trailers redirects +#user-agent="QuickTime/7.1.3 (qtver=7.1.3;cpu=PPC;os=Mac 10.4.8)" + # Drop frames to preserve audio/video sync. #framedrop = yes |