Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Sep 2011 20:08:03 +0000 (22:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Sep 2011 20:08:44 +0000 (22:08 +0200)
commit58677d73ed43020ea0840e633588e344396ee256
treeee96724ecd357d71717e99263c4104ad380b79bc
parentacc3c380cb010451e8e336b622e7ae446709d5c2
parent6248694861f0c414571fadba447a0c1cab95284e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660
  libmp3lame: fix typo
  AVOptions: drop av_ prefix from static av_get_number().
  libx264: use X264_THREADS_AUTO constant instead of 0.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avconv.c
libavcodec/libmp3lame.c
libavcodec/libx264.c
libavutil/opt.c