[FFmpeg-devel] libavfilter-soc: Update to latest ffmpeg svn

[Vitor Sessak]

Martin Storsj? wrote:
> Hi,
> 
> With the newly applied cleanup fixes to ffplay in the main ffmpeg svn, 
> there will be some conflicts when updating libavfilter-soc to use the new 
> versions. Attached is some patches to ease for the one doing the updating 
> (Stefano?). The first one is a patch from the old, fully 
> libavfilter-patched ffplay.c, to the new one after resolving the conflict. 
> The second patch is what the new file in libavfilter/diff would look like, 
> to be applied on a newer ffmpeg svn version.
> 
> Or just verbally, when doing an svn update, resolve the one conflict in 
> ffplay.c (in queue_picture, by removing the local static img_convert_ctx) 
> and add #if !CONFIG_AVFILTER around the definition of img_convert_ctx in 
> VideoState and the freeing of img_convert_ctx in stream_close.

Applied.

-Vitor