[FFmpeg-cvslog] Merge commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  3 01:56:47 2012 +0100| [211372e86dbf73505bd981dec7ad755e0623d22d] | committer: Michael Niedermayer

Merge commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16'

* commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16':
  h264: error out on unset current_picture_ptr for h->current_slice > 0
  avprobe: report per stream bit rate if set by the decoder
  aac: avoid a memcpy in sbr_qmf_analysis

Conflicts:
	avprobe.c

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

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