aacsbr: Make the previous value of bs_num_env local to read_sbr_data().

[ffmpeg] / libavcodec / png.c

diff --git a/libavcodec/png.c b/libavcodec/png.c
index 2af7700630611f9dc5a21cdb7fd92dfcff52adc9..534dc68bf1f56aa07ad0a681eb06f205ef3eee77 100644 (file)
--- a/libavcodec/png.c
+++ b/libavcodec/png.c
@@ -1,6 +1,6 @@
 /*
  * PNG image format
- * Copyright (c) 2003 Fabrice Bellard.
+ * Copyright (c) 2003 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -23,6 +23,7 @@
 #include "png.h"
 
 const uint8_t ff_pngsig[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+const uint8_t ff_mngsig[8] = {138, 77, 78, 71, 13, 10, 26, 10};
 
 /* Mask to determine which y pixels are valid in a pass */
 const uint8_t ff_png_pass_ymask[NB_PASSES] = {
@@ -80,13 +81,3 @@ int ff_png_pass_row_size(int pass, int bits_per_pixel, int width)
     pass_width = (width - xmin + (1 << shift) - 1) >> shift;
     return (pass_width * bits_per_pixel + 7) >> 3;
 }
-
-int ff_png_common_init(AVCodecContext *avctx){
-    PNGContext *s = avctx->priv_data;
-
-    avcodec_get_frame_defaults((AVFrame*)&s->picture);
-    avctx->coded_frame= (AVFrame*)&s->picture;
-//    s->avctx= avctx;
-
-    return 0;
-}