[FFmpeg-cvslog] Merge commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800'

Michael Niedermayer git at videolan.org
Thu Nov 21 12:07:24 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 21 11:57:49 2013 +0100| [074b89f1e235794b4c55cedf73a746fd37e21899] | committer: Michael Niedermayer

Merge commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800'

* commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800':
  libxavs: rename and fix a variable name

Conflicts:
	libavcodec/libxavs.c

See: 260fc0d95b025b03b2a15116526e4c83b1ca1a31
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=074b89f1e235794b4c55cedf73a746fd37e21899
---





More information about the ffmpeg-cvslog mailing list