ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Aug 8
21:53:20 2014 +0200| [5ff2b33401ec0ac6a238d02e56100b7bce8afefe] | committer:
Michael Niedermayer
Merge commit '6f1960ab71b4f18551243ce22d01913108265233'
* commit '6f1960ab71b4f18551243ce22d01913108265233':
idct: cosmetics: Drop one unnecessary if-block level
Conflicts:
libavcodec/idctdsp.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ff2b33401ec0ac6a238d02e56100b7bce8afefe
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
