aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/avc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-20 21:41:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-20 21:41:26 +0100
commit426ebdf923f9826e456bb734299fa2d2b6199524 (patch)
treef30fd4ac99579f87dec2bb4df06e30cbb0ee8859 /libavformat/avc.c
parentb853103fe0e59edc8970462abc6c181610ad9216 (diff)
parent2753d4ebf067593070ca4e9b3ea1dbe6ace23ba3 (diff)
downloadffmpeg-426ebdf923f9826e456bb734299fa2d2b6199524.tar.gz
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>
Diffstat (limited to 'libavformat/avc.c')
0 files changed, 0 insertions, 0 deletions