[MPlayer-cvslog] r38154 - in trunk: Changelog DOCS/man/en/mplayer.1 DOCS/man/fr/mplayer.1 DOCS/man/hu/mplayer.1 DOCS/man/it/mplayer.1 DOCS/man/ru/mplayer.1 DOCS/man/zh_CN/mplayer.1 etc/codecs.conf etc/example.conf

[reimar]

Author: reimar
Date: Sun Nov 17 18:32:22 2019
New Revision: 38154

Log:
codecs: split ffmpeg12vdpau

The combined MPEG1/2 decoder in FFmpeg no longer
supports any hwaccel at all.
Split it into ffmpeg1vpdau and ffmpeg2vdpau.
Only mention ffmpeg2vpdau in docs to reduce confusion
since MPEG1 is really rare.

Modified:
   trunk/Changelog
   trunk/etc/codecs.conf
   trunk/etc/example.conf

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1
   trunk/DOCS/man/fr/mplayer.1
   trunk/DOCS/man/hu/mplayer.1
   trunk/DOCS/man/it/mplayer.1
   trunk/DOCS/man/ru/mplayer.1
   trunk/DOCS/man/zh_CN/mplayer.1

Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog	Sun Nov 17 18:32:16 2019	(r38153)
+++ trunk/Changelog	Sun Nov 17 18:32:22 2019	(r38154)
@@ -1,5 +1,9 @@
 MPlayer
 
+    Decoders, demuxers, streams:
+    * ffmpeg12vpdau is no longer supported by FFmpeg,
+      provide separate ffmpeg1vpdau and ffmpeg2vdpau instead
+
   1.4: "SubCounter" April 18, 2019
 
     Decoders, demuxers, streams:

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sun Nov 17 18:32:16 2019	(r38153)
+++ trunk/etc/codecs.conf	Sun Nov 17 18:32:22 2019	(r38154)
@@ -611,17 +611,27 @@ videocodec ffmpeg12mc
   out IDCT_MPEG2
   out MOCO_MPEG2
 
-videocodec ffmpeg12vdpau
-  info "FFmpeg MPEG-1/2 (VDPAU)"
+videocodec ffmpeg1vdpau
+  info "FFmpeg MPEG-1 (VDPAU)"
   status working
   format 0x10000001  ; MPEG-1
-  format 0x10000002  ; MPEG-2
-  fourcc mpg1,mpg2,MPG2
+  fourcc mpg1
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
+  fourcc MPEG
+  fourcc m1v1
+  fourcc "m1v "
+  driver ffmpeg
+  dll "mpeg1video"
+  out VDPAU_MPEG1
+
+videocodec ffmpeg2vdpau
+  info "FFmpeg MPEG-1/2 (VDPAU)"
+  status working
+  format 0x10000002  ; MPEG-2
+  fourcc mpg2,MPG2
   fourcc PIM2        ; Pinnacle hardware-MPEG-2
   fourcc "DVR "
   fourcc hdv2
-  fourcc MPEG
   fourcc hdv1
   fourcc hdv3        ; HDV 1080i50
   fourcc hdv5        ; HDV  720p25
@@ -637,11 +647,9 @@ videocodec ffmpeg12vdpau
   fourcc AVmp
   fourcc mp2v,mpgv
   fourcc LMP2 ; Lead mpeg2 in avi
-  fourcc m2v1,m1v1
-  fourcc "m1v "
+  fourcc m2v1
   driver ffmpeg
-  dll "mpegvideo"
-  out VDPAU_MPEG1
+  dll "mpeg2video"
   out VDPAU_MPEG2
 
 videocodec ffmpeg2crystalhd

Modified: trunk/etc/example.conf
==============================================================================
--- trunk/etc/example.conf	Sun Nov 17 18:32:16 2019	(r38153)
+++ trunk/etc/example.conf	Sun Nov 17 18:32:22 2019	(r38154)
@@ -159,7 +159,7 @@
 #nocache=yes
 
 #[vo.vdpau]
-#vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau,
+#vc=ffmpeg2vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau,
 # Most video filters do not work with vdpau.
 #vf-clr=yes