[vlc-commits] avformat demux: don't access removed info

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Jan 29 00:34:07 2012 -0500| [4ca6ef05e16554c71c7480a7b4df59ab3a43f6c4] | committer: Rafaël Carré

avformat demux: don't access removed info

Palette data is now transmitted as a side data in AVPacket

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4ca6ef05e16554c71c7480a7b4df59ab3a43f6c4
---

 modules/demux/avformat/demux.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index cf3ef3d..28920e2 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -294,11 +294,15 @@ int OpenDemux( vlc_object_t *p_this )
 
             fmt.video.i_width = cc->width;
             fmt.video.i_height = cc->height;
+#if LIBAVCODEC_VERSION_MAJOR < 54
             if( cc->palctrl )
             {
                 fmt.video.p_palette = malloc( sizeof(video_palette_t) );
                 *fmt.video.p_palette = *(video_palette_t *)cc->palctrl;
             }
+#else
+# warning FIXME: implement palette transmission
+#endif
             psz_type = "video";
             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 );