X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Favcodec%2Favcodec.h;h=3cfc0d7dd74af4ac5a93366f16df150b65b18225;hb=a69ba6d4dd6d0682399f2e49e300f8cf3a56c705;hp=f7ab24d024ba046746db3d0eeb006ab3251b1db1;hpb=bb1dbbdf02dc16c5973719c627d04c186711e91b;p=vlc diff --git a/modules/codec/avcodec/avcodec.h b/modules/codec/avcodec/avcodec.h index f7ab24d024..3cfc0d7dd7 100644 --- a/modules/codec/avcodec/avcodec.h +++ b/modules/codec/avcodec/avcodec.h @@ -74,7 +74,7 @@ void EndSubtitleDec( decoder_t *p_dec ); #define ERROR_TEXT N_("Error resilience") #define ERROR_LONGTEXT N_( \ - "Ffmpeg can do error resilience.\n" \ + "FFmpeg can do error resilience.\n" \ "However, with a buggy encoder (such as the ISO MPEG-4 encoder from M$) " \ "this can produce a lot of errors.\n" \ "Valid values range from 0 to 4 (0 disables all errors resilience).") @@ -113,7 +113,7 @@ void EndSubtitleDec( decoder_t *p_dec ); "(-1=None, 0=Default, 1=B-frames, 2=P-frames, 3=B+P frames, 4=all frames)." ) #define DEBUG_TEXT N_( "Debug mask" ) -#define DEBUG_LONGTEXT N_( "Set ffmpeg debug mask" ) +#define DEBUG_LONGTEXT N_( "Set FFmpeg debug mask" ) /* TODO: Use a predefined list, with 0,1,2,4,7 */ #define VISMV_TEXT N_( "Visualize motion vectors" ) @@ -265,6 +265,7 @@ void EndSubtitleDec( decoder_t *p_dec ); # define AV_VERSION_INT(a, b, c) ((a)<<16 | (b)<<8 | (c)) #endif -/* Uncomment it to enable compilation with vaapi (you also must change the build +/* Uncomment it to enable compilation with vaapi/dxva2 (you also must change the build * system) */ //#define HAVE_AVCODEC_VAAPI 1 +//#define HAVE_AVCODEC_DXVA2 1