ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Aug 19
19:11:58 2014 +0200| [4042c8eee1879e321092d650a421d2205aac6fe0] | committer:
Michael Niedermayer
Merge commit '14d2006ca6c0e2b54784b93560f09e0e19c0a270'
* commit '14d2006ca6c0e2b54784b93560f09e0e19c0a270':
pcm: Drop unused variable from DECODE_PLANAR macro
Conflicts:
libavcodec/pcm.c
No change as the changed code isnt in ffmpeg
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4042c8eee1879e321092d650a421d2205aac6fe0
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
