diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-10 23:59:08 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-10 23:59:08 +0300 |
| commit | 259ea9d7034566760785fd5253f97b65ee8cd6ed (patch) | |
| tree | 421140d6bf14e32f09acc4d0180d2273a9e88965 /libmpcodecs/vd_libmpeg2.c | |
| parent | b56858342fdbe48489618107df75e5bd0451eb0b (diff) | |
| parent | 60a3099c0db23d03b9f2501c2ef2cf35847b30a7 (diff) | |
| download | mpv-259ea9d7034566760785fd5253f97b65ee8cd6ed.tar.bz2 mpv-259ea9d7034566760785fd5253f97b65ee8cd6ed.tar.xz | |
Merge svn changes up to r27573
Conflicts:
libmpcodecs/vd_ffmpeg.c
Diffstat (limited to 'libmpcodecs/vd_libmpeg2.c')
| -rw-r--r-- | libmpcodecs/vd_libmpeg2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c index 3bd17a4e0e..eeab4b23be 100644 --- a/libmpcodecs/vd_libmpeg2.c +++ b/libmpcodecs/vd_libmpeg2.c @@ -11,7 +11,7 @@ static const vd_info_t info = { - "MPEG 1/2 Video decoder libmpeg2-v0.4.0b", + "libmpeg2 MPEG 1/2 Video decoder", "libmpeg2", "A'rpi & Fabian Franz", "Aaron & Walken", |