[FFmpeg-cvslog] Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67'
Michael Niedermayer
git at videolan.org
Thu Nov 13 13:04:20 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 12:53:31 2014 +0100| [76fa78911f58c9707226559e0f57be8d47fb2fca] | committer: Michael Niedermayer
Merge commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67'
* commit 'b1b1a7370e141c912e3d0bbaa668dcee05c3ad67':
display: fix order of operands
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76fa78911f58c9707226559e0f57be8d47fb2fca
---
More information about the ffmpeg-cvslog
mailing list