[FFmpeg-cvslog] Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 12 13:26:15 2013 +0100| [7491356111e7f171b6cd4f23a8d8fb32439485ca] | committer: Michael Niedermayer

Merge commit '304b806cb524fb040f8e09a241040f1af2cb820b'

* commit '304b806cb524fb040f8e09a241040f1af2cb820b':
  build: Make library minor version visible in the Makefile
  x86: mpeg4qpel: Make movsxifnidn do the right thing

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

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