Commit 4ca6ef05 authored by Rafaël Carré's avatar Rafaël Carré

avformat demux: don't access removed info

Palette data is now transmitted as a side data in AVPacket
parent 0011b704
...@@ -294,11 +294,15 @@ int OpenDemux( vlc_object_t *p_this ) ...@@ -294,11 +294,15 @@ int OpenDemux( vlc_object_t *p_this )
fmt.video.i_width = cc->width; fmt.video.i_width = cc->width;
fmt.video.i_height = cc->height; fmt.video.i_height = cc->height;
#if LIBAVCODEC_VERSION_MAJOR < 54
if( cc->palctrl ) if( cc->palctrl )
{ {
fmt.video.p_palette = malloc( sizeof(video_palette_t) ); fmt.video.p_palette = malloc( sizeof(video_palette_t) );
*fmt.video.p_palette = *(video_palette_t *)cc->palctrl; *fmt.video.p_palette = *(video_palette_t *)cc->palctrl;
} }
#else
# warning FIXME: implement palette transmission
#endif
psz_type = "video"; psz_type = "video";
fmt.video.i_frame_rate = cc->time_base.den; fmt.video.i_frame_rate = cc->time_base.den;
fmt.video.i_frame_rate_base = cc->time_base.num * __MAX( cc->ticks_per_frame, 1 ); fmt.video.i_frame_rate_base = cc->time_base.num * __MAX( cc->ticks_per_frame, 1 );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment