diff options
author | wm4 <wm4@mplayer2.org> | 2012-07-28 17:07:49 +0200 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-07-28 17:24:05 +0200 |
commit | 51e198c2a1e43b74ad35ef358628dcd8791158d9 (patch) | |
tree | 60f6c2255ed912a7a4866b71728104a2cb2442f1 /etc | |
parent | 2793e7eb70a342b346788f83e1ed660c8e0d491e (diff) | |
parent | 7dfaaa95104a8e6dc024fddaf1b49c71768f1be7 (diff) | |
download | mpv-51e198c2a1e43b74ad35ef358628dcd8791158d9.tar.bz2 mpv-51e198c2a1e43b74ad35ef358628dcd8791158d9.tar.xz |
Merge remote-tracking branch 'origin/master'
Conflicts:
.gitignore
bstr.c
cfg-mplayer.h
defaultopts.c
libvo/video_out.c
The conflict in bstr.c is due to uau adding a bstr_getline function in
commit 2ba8b91a97e7e8. This function already existed in this branch.
While uau's function is obviously derived from mine, it's incompatible.
His function preserves line breaks, while mine strips them. Add a
bstr_strip_linebreaks function, fix all other uses of bstr_getline, and
pick uau's implementation.
In .gitignore, change vo_gl3_shaders.h to use an absolute path
additional to resolving the merge conflict.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/codecs.conf | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index edec66ecce..8f0220fece 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3,12 +3,18 @@ ; Before editing this file, please read DOCS/tech/codecs.conf.txt ! ;============================================================================= -release 20110311 +release 20120717 ;============================================================================= ; VIDEO CODECS ;============================================================================= +videocodec lavc + info "Generic libavcodec decoder" + status buggy + driver ffmpeg + anyinput + videocodec ffanm info "FFmpeg Deluxe Paint Animation" status working @@ -777,7 +783,7 @@ videocodec ffindeo2 videocodec ffflv info "FFmpeg Flash video" status working - fourcc FLV1,flv + fourcc FLV1 driver ffmpeg dll flv @@ -3485,6 +3491,7 @@ videocodec null status crashing comment "for unknown/unsupported codecs or testing" driver null + anyinput out YV12 out I420 out YUY2 @@ -3496,6 +3503,12 @@ videocodec null ; AUDIO CODECS ;============================================================================= +audiocodec lavc + info "Generic libavcodec decoder" + status buggy + driver ffmpeg + anyinput + audiocodec wma9dmo info "Windows Media Audio 9 DMO" status working |