[vlc-devel] [vlc-commits] contrib: Pin libav/ffmpeg to a specific commit

[Hugo Beauzée-Luyssen]

On Tue, Feb 21, 2017, at 04:06 PM, Hugo Beauzée-Luyssen wrote:
> vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Feb
> 21 16:04:52 2017 +0100| [913fc6cb727d9f215722595fc6a85eaa289ba0f0] |
> committer: Hugo Beauzée-Luyssen
> 
> contrib: Pin libav/ffmpeg to a specific commit
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=913fc6cb727d9f215722595fc6a85eaa289ba0f0
> ---
> 
>  contrib/src/ffmpeg/rules.mak | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
> index 3cd3dfe..043a387 100644
> --- a/contrib/src/ffmpeg/rules.mak
> +++ b/contrib/src/ffmpeg/rules.mak
> @@ -5,11 +5,11 @@
>  #USE_FFMPEG ?= 1
>  
>  ifdef USE_FFMPEG
> -FFMPEG_HASH=HEAD
> +FFMPEG_HASH=cbd622be
>  FFMPEG_SNAPURL :=
>  http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
>  FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
>  else
> -FFMPEG_HASH=HEAD
> +FFMPEG_HASH=b3825723
>  FFMPEG_SNAPURL :=
>  http://git.libav.org/?p=libav.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
>  FFMPEG_GITURL := git://git.libav.org/libav.git
>  endif
> 

FYI, the rationale here is:
- libav -> Pin to a commit that doesn't break android x86 build
- ffmpeg -> Use current master

-- 
  Hugo Beauzée-Luyssen
  hugo at beauzee.fr