From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 20 Mar 2013 20:41:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'cigaes/master'
X-Git-Tag: android-x86-4.4-r1~4913
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=426ebdf923f9826e456bb734299fa2d2b6199524;p=android-x86%2Fexternal-ffmpeg.git

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/vf_yadif: use standard options parsing.
  lavfi/vf_unsharp: use standard options parsing.
  lavfi/vf_transpose: use standard options parsing.
  lavfi/vf_pad: use standard options parsing.
  lavfi/vf_fps: use standard options parsing.
  lavfi/vf_fade: use standard options parsing.
  lavi/vf_drawbox: use standard options parsing.
  lavfi/vf_delogo: use standard options parsing.
  lavfi/vf_decimate: use standard options parsing.
  lavfi/vf_crop: use standard options parsing.
  lavfi/af_volume: use standard options parsing.
  lavfi/vf_tile: use standard options parsing.
  lavfi/avf_concat: use standard options parsing.
  lavfi: add common code to handle options parsing.
  lavf/vobsub: free index pseudo-packet.
  ffmpeg: fix freeing of sub2video frame.
  lavfi: add sine audio source.
  lavu/opt: add AV_OPT_TYPE_DURATION.
  lavfi/concat: fix silence duration computation.
  lavf/concatdec: support seeking.

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

426ebdf923f9826e456bb734299fa2d2b6199524