[FFmpeg-cvslog] lavd/avdevice: fix buildbreak when included to C++ code

Lukasz Marek git at videolan.org
Sun Apr 13 05:42:41 CEST 2014


ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2 at gmail.com> | Sat Apr 12 21:14:21 2014 +0200| [88c4e5a049aa42a3c005cae5eff7cc7718c6f3b0] | committer: Michael Niedermayer

lavd/avdevice: fix buildbreak when included to C++ code

class is reserved keyword in C++ and compilator complains about that variable.

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88c4e5a049aa42a3c005cae5eff7cc7718c6f3b0
---

 libavdevice/avdevice.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h
index 1d9de91..6085eb4 100644
--- a/libavdevice/avdevice.h
+++ b/libavdevice/avdevice.h
@@ -344,7 +344,7 @@ int avdevice_dev_to_app_control_message(struct AVFormatContext *s,
  * to implement capabilities probing API based on AVOption API. Should not be used directly.
  */
 typedef struct AVDeviceCapabilitiesQuery {
-    const AVClass *class;
+    const AVClass *av_class;
     AVFormatContext *device_context;
     enum AVCodecID codec;
     enum AVSampleFormat sample_format;



More information about the ffmpeg-cvslog mailing list