Skip to content

Commit 40b9891

Browse files
authored
Update FFmpegWriter.cpp
Reverse 1st attempt
1 parent e1b474e commit 40b9891

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

src/FFmpegWriter.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -992,14 +992,7 @@ AVStream *FFmpegWriter::add_audio_stream() {
992992
throw InvalidCodec("A valid audio codec could not be found for this file.", path);
993993

994994
// Create a new audio stream
995-
#if (IS_FFMPEG_3_2 && (LIBAVFORMAT_VERSION_MAJOR < 58))
996-
_Pragma ("GCC diagnostic push")
997-
_Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
998-
#endif
999995
AV_FORMAT_NEW_STREAM(oc, audio_codec, codec, st)
1000-
#if (IS_FFMPEG_3_2 && (LIBAVFORMAT_VERSION_MAJOR < 58))
1001-
_Pragma ("GCC diagnostic pop")
1002-
#endif
1003996

1004997
c->codec_id = codec->id;
1005998
#if LIBAVFORMAT_VERSION_MAJOR >= 53
@@ -1082,14 +1075,7 @@ AVStream *FFmpegWriter::add_video_stream() {
10821075
throw InvalidCodec("A valid video codec could not be found for this file.", path);
10831076

10841077
// Create a new video stream
1085-
#if (IS_FFMPEG_3_2 && (LIBAVFORMAT_VERSION_MAJOR < 58))
1086-
_Pragma ("GCC diagnostic push")
1087-
_Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
1088-
#endif
10891078
AV_FORMAT_NEW_STREAM(oc, video_codec, codec, st)
1090-
#if (IS_FFMPEG_3_2 && (LIBAVFORMAT_VERSION_MAJOR < 58))
1091-
_Pragma ("GCC diagnostic pop")
1092-
#endif
10931079

10941080
c->codec_id = codec->id;
10951081
#if LIBAVFORMAT_VERSION_MAJOR >= 53

0 commit comments

Comments
 (0)