mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-23 15:53:08 +00:00
4778783160
* commit '3b266da3d35f3f7a61258b78384dfe920d875d29':
avconv: add support for complex filtergraphs.
avconv: make filtergraphs global.
avconv: move filtered_frame from InputStream to OutputStream.
avconv: don't set output width/height directly from input value.
avconv: move resample_{width,height,pix_fmt} to InputStream.
avconv: remove a useless variable from OutputStream.
avconv: get output pixel format from lavfi.
graphparser: fix the order in which unlabeled input links are returned.
avconv: change {input,output}_{streams,files} into arrays of pointers.
avconv: don't pass input/output streams to some functions.
Conflicts:
cmdutils.c
cmdutils.h
doc/ffmpeg.texi
ffmpeg.c
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
||
|---|---|---|
| .. | ||
| amv | ||
| asv1 | ||
| asv2 | ||
| cljr | ||
| dnxhd_720p | ||
| dnxhd_720p_10bit | ||
| dnxhd_720p_rd | ||
| dnxhd_1080i | ||
| dv | ||
| dv50 | ||
| dv_411 | ||
| error | ||
| ffv1 | ||
| ffvhuff | ||
| flashsv | ||
| flashsv2 | ||
| flv | ||
| h261 | ||
| h263 | ||
| h263p | ||
| huffyuv | ||
| jpeg2000 | ||
| jpegls | ||
| ljpeg | ||
| mjpeg | ||
| mpeg | ||
| mpeg1b | ||
| mpeg2 | ||
| mpeg2_422 | ||
| mpeg2_idct_int | ||
| mpeg2_ilace | ||
| mpeg2_ivlc_qprd | ||
| mpeg2thread | ||
| mpeg2thread_ilace | ||
| mpeg4 | ||
| mpeg4_adap | ||
| mpeg4_qpel | ||
| mpeg4_qprd | ||
| mpeg4adv | ||
| mpeg4nr | ||
| mpeg4thread | ||
| mpng | ||
| msmpeg4 | ||
| msmpeg4v2 | ||
| msvideo1 | ||
| prores | ||
| prores_kostya | ||
| qtrle | ||
| qtrlegray | ||
| r210 | ||
| rc | ||
| rgb | ||
| roq | ||
| rv10 | ||
| rv20 | ||
| snow | ||
| snowll | ||
| svq1 | ||
| v210 | ||
| v308 | ||
| v408 | ||
| vref | ||
| wmv1 | ||
| wmv2 | ||
| y41p | ||
| yuv | ||
| yuv4 | ||
| zlib | ||
| zmbv | ||