diff options
Diffstat (limited to 'contrib/ffmpeg/libavcodec/mmvideo.c')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/mmvideo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/ffmpeg/libavcodec/mmvideo.c b/contrib/ffmpeg/libavcodec/mmvideo.c index 7ba1321cb..9c169a004 100644 --- a/contrib/ffmpeg/libavcodec/mmvideo.c +++ b/contrib/ffmpeg/libavcodec/mmvideo.c @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** @@ -59,7 +59,6 @@ static int mm_decode_init(AVCodecContext *avctx) } avctx->pix_fmt = PIX_FMT_PAL8; - avctx->has_b_frames = 0; if (avcodec_check_dimensions(avctx, avctx->width, avctx->height)) return -1; @@ -151,7 +150,7 @@ static void mm_decode_inter(MmContext * s, int half_horiz, int half_vert, const static int mm_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { MmContext *s = avctx->priv_data; AVPaletteControl *palette_control = avctx->palctrl; |