Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 12:57:59 +0000 (13:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 12:58:04 +0000 (13:58 +0100)
commit9ea6c14820da382281092660cbf2b502ab6f3403
tree64c09df96da2705d86a35d8ce352c866e3db94e1
parent271f95940b0f4329d439a2d49abd16e60a003562
parenta964d6a8a26d4e0858f7df9a6bfee949fe9c16ea
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavu/frame: use channels rather than channel_layout.
  lavf: avformat_seek_file(): validate stream_index.
  lavf/concatdec: fix possible leak in case of malloc failure.
  lavfi/buffersink: check av_frame_ref() failure.

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