ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Sep 5
19:24:49 2014 +0200| [1e4e760f767b597f88442b75e90d726ae626b230] | committer:
Michael Niedermayer
Merge commit '213e606752d16f51337e94431962fb5d7749c07e'
* commit '213e606752d16f51337e94431962fb5d7749c07e':
Replace av_unused attributes by block structures
Conflicts:
libavcodec/h264_loopfilter.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1e4e760f767b597f88442b75e90d726ae626b230
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
