summaryrefslogtreecommitdiff
path: root/package/vlc/patches/patch-modules_codec_avcodec_video_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-09-24 22:23:58 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-09-24 22:27:25 +0200
commit3489adabed6655c084b7a4e43f3e8ab38ae56072 (patch)
tree697f74bd8f90af352bc965e6d2a0537c1ac2f11f /package/vlc/patches/patch-modules_codec_avcodec_video_c
parent0ba6cb19afd16f5c04297984d4120ee880b2493c (diff)
vlc: update to 2.2.4, add buildroot patchsets
Diffstat (limited to 'package/vlc/patches/patch-modules_codec_avcodec_video_c')
-rw-r--r--package/vlc/patches/patch-modules_codec_avcodec_video_c51
1 files changed, 51 insertions, 0 deletions
diff --git a/package/vlc/patches/patch-modules_codec_avcodec_video_c b/package/vlc/patches/patch-modules_codec_avcodec_video_c
new file mode 100644
index 000000000..07e2728e3
--- /dev/null
+++ b/package/vlc/patches/patch-modules_codec_avcodec_video_c
@@ -0,0 +1,51 @@
+--- vlc-2.2.4.orig/modules/codec/avcodec/video.c 2016-04-07 21:36:15.000000000 +0200
++++ vlc-2.2.4/modules/codec/avcodec/video.c 2016-09-24 20:35:02.681191261 +0200
+@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC
+ static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * );
+ static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
+ #endif
+-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
+- const enum PixelFormat * );
++static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *,
++ const enum AVPixelFormat * );
+
+ static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
+ {
+@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
+ p_sys->p_codec = p_codec;
+ p_sys->i_codec_id = i_codec_id;
+ p_sys->psz_namecodec = psz_namecodec;
+- p_sys->p_ff_pic = avcodec_alloc_frame();
++ p_sys->p_ff_pic = av_frame_alloc();
+ p_sys->b_delayed_open = true;
+ p_sys->p_va = NULL;
+ vlc_sem_init( &p_sys->sem_mt, 0 );
+@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
+ if( ffmpeg_OpenCodec( p_dec ) < 0 )
+ {
+ msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
+- avcodec_free_frame( &p_sys->p_ff_pic );
++ av_frame_free( &p_sys->p_ff_pic );
+ vlc_sem_destroy( &p_sys->sem_mt );
+ free( p_sys );
+ return VLC_EGENERIC;
+@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
+ wait_mt( p_sys );
+
+ if( p_sys->p_ff_pic )
+- avcodec_free_frame( &p_sys->p_ff_pic );
++ av_frame_free( &p_sys->p_ff_pic );
+
+ if( p_sys->p_va )
+ vlc_va_Delete( p_sys->p_va );
+@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
+ }
+ #endif
+
+-static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
+- const enum PixelFormat *pi_fmt )
++static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
++ const enum AVPixelFormat *pi_fmt )
+ {
+ decoder_t *p_dec = p_context->opaque;
+ decoder_sys_t *p_sys = p_dec->p_sys;