On Sun, Aug 03, 2014 at 10:49:39PM +0200, Michael Niedermayer wrote: > On Sun, Aug 03, 2014 at 10:46:58PM +0200, Michael Niedermayer wrote: > > On Sun, Aug 03, 2014 at 07:24:56PM +0100, Kieran Kunhya wrote: > > > --- > > > doc/APIchanges | 4 ++++ > > > libavcodec/avcodec.h | 5 ++++- > > > libavcodec/mpeg12dec.c | 20 +++++++++++++++++++- > > > libavcodec/version.h | 5 ++++- > > > libavfilter/vf_showinfo.c | 3 +++ > > > libavutil/frame.h | 16 ++++++++++++++++ > > > libavutil/version.h | 2 +- > > > 7 files changed, 51 insertions(+), 4 deletions(-) > > [...] > > > @@ -1631,6 +1633,18 @@ static int mpeg_field_start(MpegEncContext *s, > > > const uint8_t *buf, int buf_size) > > > *stereo = s1->stereo3d; > > > s1->has_stereo3d = 0; > > > } > > > + > > > + if (s1->has_afd) { > > > + AVFrameSideData *sd = av_frame_new_side_data( > > > + s->current_picture_ptr->f, AV_FRAME_DATA_AFD, > > > + 1); > > > + if (!sd) > > > + return AVERROR(ENOMEM); > > > + > > > > > + sd->data = s1->afd; > > > > this should be > > *(uint8_t*)sd->data = s1->afd; > > or simpler > *sd->data = s1->afd;
applied with that fix merged the reformatted one thanks to all [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Observe your enemies, for they first find out your faults. -- Antisthenes
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel