rtspenc: Check the return value from ffio_open_dyn_packet_buf

[ffmpeg] / libavformat / r3d.c

diff --git a/libavformat/r3d.c b/libavformat/r3d.c
index a5e5d1c4f6e8a3f39b282859a0839232d4f15c2a..1da8b88d5b378e363dd5357b97a47872e5a0dc14 100644 (file)
--- a/libavformat/r3d.c
+++ b/libavformat/r3d.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//#define DEBUG
-
 #include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
 #include "libavutil/mathematics.h"
@@ -62,7 +60,7 @@ static int r3d_read_red1(AVFormatContext *s)
     if (!st)
         return AVERROR(ENOMEM);
     st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    st->codec->codec_id = CODEC_ID_JPEG2000;
+    st->codec->codec_id = AV_CODEC_ID_JPEG2000;
 
     tmp  = avio_r8(s->pb); // major version
     tmp2 = avio_r8(s->pb); // minor version
@@ -88,9 +86,6 @@ static int r3d_read_red1(AVFormatContext *s)
     framerate.num = avio_rb16(s->pb);
     framerate.den = avio_rb16(s->pb);
     if (framerate.num && framerate.den) {
-#if FF_API_R_FRAME_RATE
-        st->r_frame_rate =
-#endif
         st->avg_frame_rate = framerate;
     }
 
@@ -101,7 +96,7 @@ static int r3d_read_red1(AVFormatContext *s)
         if (!ast)
             return AVERROR(ENOMEM);
         ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-        ast->codec->codec_id = CODEC_ID_PCM_S32BE;
+        ast->codec->codec_id = AV_CODEC_ID_PCM_S32BE;
         ast->codec->channels = tmp;
         avpriv_set_pts_info(ast, 32, 1, st->time_base.den);
     }