Showing with 10,569 additions and 5,467 deletions.
  1. +15 −2 Changelog
  2. +0 −4 MAINTAINERS
  3. +1 −1 Makefile
  4. +344 −318 avconv.c
  5. +191 −157 cmdutils.c
  6. +13 −3 configure
  7. +11 −4 doc/APIchanges
  8. +4 −4 doc/avconv.texi
  9. +21 −54 doc/doxy/doxy_stylesheet.css
  10. +1 −13 doc/doxy/footer.html
  11. +0 −3 doc/doxy/header.html
  12. +1 −1 doc/encoders.texi
  13. +45 −1 doc/ffprobe.texi
  14. +102 −0 doc/ffprobe.xsd
  15. +142 −7 doc/filters.texi
  16. +9 −1 doc/general.texi
  17. +13 −13 doc/indevs.texi
  18. +7 −7 doc/libavfilter.texi
  19. +1 −1 doc/outdevs.texi
  20. +7 −7 doc/protocols.texi
  21. +367 −311 ffmpeg.c
  22. +272 −268 ffplay.c
  23. +289 −21 ffprobe.c
  24. +5 −1 ffserver.c
  25. +0 −1 libavcodec/8svx.c
  26. +8 −0 libavcodec/Makefile
  27. +6 −5 libavcodec/aacdec.c
  28. +1 −1 libavcodec/adx.c
  29. +18 −14 libavcodec/adx_parser.c
  30. +17 −8 libavcodec/adxdec.c
  31. +77 −108 libavcodec/adxenc.c
  32. +38 −37 libavcodec/alac.c
  33. +15 −3 libavcodec/alacenc.c
  34. +5 −0 libavcodec/allcodecs.c
  35. +1 −1 libavcodec/alsdec.c
  36. +0 −3 libavcodec/arm/rv34dsp_init_neon.c
  37. +0 −24 libavcodec/arm/rv34dsp_neon.S
  38. +3 −3 libavcodec/atrac3.c
  39. +8 −0 libavcodec/avcodec.h
  40. +12 −11 libavcodec/bfi.c
  41. +6 −6 libavcodec/bgmc.c
  42. +25 −28 libavcodec/bintext.c
  43. +1 −1 libavcodec/bmp.c
  44. +6 −1 libavcodec/bmpenc.c
  45. +25 −9 libavcodec/bmv.c
  46. +5 −1 libavcodec/bytestream.h
  47. +0 −31 libavcodec/cabac.c
  48. +0 −61 libavcodec/cabac.h
  49. +10 −10 libavcodec/cljr.c
  50. +366 −364 libavcodec/cook.c
  51. +289 −257 libavcodec/dca.c
  52. +61 −61 libavcodec/dct.c
  53. +0 −1 libavcodec/diracdec.c
  54. +2 −3 libavcodec/dnxhdenc.c
  55. +1 −1 libavcodec/dv.c
  56. +6 −2 libavcodec/error_resilience.c
  57. +9 −9 libavcodec/flashsv2enc.c
  58. +3 −3 libavcodec/g723_1.c
  59. +6 −8 libavcodec/g729dec.c
  60. +20 −23 libavcodec/h264.c
  61. +1 −1 libavcodec/h264_cabac.c
  62. +7 −5 libavcodec/h264_mp4toannexb_bsf.c
  63. +2 −3 libavcodec/h264_refs.c
  64. +1 −1 libavcodec/imgconvert.c
  65. +826 −0 libavcodec/indeo4.c
  66. +350 −0 libavcodec/indeo4data.h
  67. +9 −8 libavcodec/indeo5.c
  68. +3 −1 libavcodec/ivi_common.c
  69. +4 −4 libavcodec/ivi_common.h
  70. +148 −1 libavcodec/ivi_dsp.c
  71. +38 −1 libavcodec/ivi_dsp.h
  72. +10 −11 libavcodec/j2kdec.c
  73. +7 −7 libavcodec/j2kenc.c
  74. +7 −1 libavcodec/lcldec.c
  75. +8 −8 libavcodec/libaacplus.c
  76. +72 −67 libavcodec/libmp3lame.c
  77. +14 −3 libavcodec/libopenjpegdec.c
  78. +2 −2 libavcodec/libopenjpegenc.c
  79. +7 −5 libavcodec/libspeexenc.c
  80. +110 −81 libavcodec/libvorbis.c
  81. +1 −1 libavcodec/libx264.c
  82. +89 −19 libavcodec/mjpegdec.c
  83. +2 −0 libavcodec/mjpegdec.h
  84. +1 −1 libavcodec/mjpegenc.c
  85. +3 −0 libavcodec/mlp_parser.c
  86. +3 −1 libavcodec/mpeg12.c
  87. +2 −1 libavcodec/mpegaudiodec.c
  88. +36 −33 libavcodec/mpegvideo.c
  89. +1 −0 libavcodec/mpegvideo.h
  90. +1,108 −832 libavcodec/mpegvideo_enc.c
  91. +8 −8 libavcodec/msvideo1enc.c
  92. +1 −1 libavcodec/nellymoserdec.c
  93. +2 −2 libavcodec/options.c
  94. +16 −3 libavcodec/pamenc.c
  95. +7 −0 libavcodec/pcxenc.c
  96. +1 −1 libavcodec/pictordec.c
  97. +19 −2 libavcodec/pngdec.c
  98. +4 −1 libavcodec/pnm.c
  99. +1 −1 libavcodec/proresdec2.c
  100. +0 −1 libavcodec/proresenc.c
  101. +37 −11 libavcodec/pthread.c
  102. +9 −3 libavcodec/qpeg.c
  103. +18 −1 libavcodec/r210dec.c
  104. +1 −1 libavcodec/ra144enc.c
  105. +47 −38 libavcodec/rv34.c
  106. +0 −10 libavcodec/rv34data.h
  107. +0 −16 libavcodec/rv34dsp.c
  108. +0 −1 libavcodec/rv34dsp.h
  109. +3 −3 libavcodec/snow.c
  110. +21 −24 libavcodec/sonic.c
  111. +2 −2 libavcodec/sunrast.c
  112. +45 −32 libavcodec/tiff.c
  113. +33 −39 libavcodec/ulti.c
  114. +2 −0 libavcodec/utils.c
  115. +94 −7 libavcodec/utvideo.c
  116. +108 −0 libavcodec/v308dec.c
  117. +96 −0 libavcodec/v308enc.c
  118. +7 −3 libavcodec/v410dec.c
  119. +2 −2 libavcodec/v410enc.c
  120. +2 −2 libavcodec/vaapi_mpeg2.c
  121. +14 −14 libavcodec/vaapi_vc1.c
  122. +1 −1 libavcodec/vble.c
  123. +5 −1 libavcodec/vc1dec.c
  124. +5 −0 libavcodec/vcr1.c
  125. +1 −1 libavcodec/version.h
  126. +3 −3 libavcodec/vorbis.c
  127. +35 −12 libavcodec/vorbisdec.c
  128. +2 −10 libavcodec/vp3.c
  129. +355 −335 libavcodec/wavpack.c
  130. +72 −31 libavcodec/wmalosslessdec.c
  131. +2 −2 libavcodec/x86/h264_i386.h
  132. +116 −0 libavcodec/y41pdec.c
  133. +102 −0 libavcodec/y41penc.c
  134. +109 −0 libavcodec/yuv4dec.c
  135. +93 −0 libavcodec/yuv4enc.c
  136. +2 −1 libavdevice/lavfi.c
  137. +231 −115 libavdevice/v4l2.c
  138. +5 −0 libavfilter/Makefile
  139. +288 −0 libavfilter/af_amerge.c
  140. +55 −0 libavfilter/af_asplit.c
  141. +208 −0 libavfilter/af_astreamsync.c
  142. +5 −0 libavfilter/allfilters.c
  143. +3 −3 libavfilter/avfilter.c
  144. +2 −10 libavfilter/avfilter.h
  145. +11 −4 libavfilter/defaults.c
  146. +10 −1 libavfilter/vf_drawtext.c
  147. +243 −0 libavfilter/vf_thumbnail.c
  148. +328 −0 libavfilter/vf_tinterlace.c
  149. +1 −0 libavformat/Makefile
  150. +1 −0 libavformat/adxdec.c
  151. +1 −1 libavformat/allformats.c
  152. +15 −6 libavformat/applehttp.c
  153. +12 −2 libavformat/applehttpproto.c
  154. +0 −1 libavformat/asf.c
  155. +4 −0 libavformat/aviobuf.c
  156. +1 −2 libavformat/cache.c
  157. +10 −10 libavformat/cafenc.c
  158. +0 −1 libavformat/crcenc.c
  159. +5 −1 libavformat/electronicarts.c
  160. +0 −1 libavformat/ffmenc.c
  161. +19 −18 libavformat/flvdec.c
  162. +0 −1 libavformat/framecrcenc.c
  163. +4 −6 libavformat/g723_1.c
  164. +1 −1 libavformat/id3v2.c
  165. +6 −2 libavformat/ipmovie.c
  166. +4 −0 libavformat/isom.c
  167. +5 −0 libavformat/iss.c
  168. +1 −1 libavformat/matroskadec.c
  169. +0 −2 libavformat/md5enc.c
  170. +6 −9 libavformat/mkvtimestamp_v2.c
  171. +1 −1 libavformat/mmst.c
  172. +2 −2 libavformat/mov.c
  173. +0 −2 libavformat/movenc.c
  174. +5 −3 libavformat/mp3enc.c
  175. +1 −1 libavformat/mpegenc.c
  176. +1 −1 libavformat/mpegts.c
  177. +26 −9 libavformat/mpegtsenc.c
  178. +5 −3 libavformat/mtv.c
  179. +5 −5 libavformat/mxfdec.c
  180. +1 −1 libavformat/mxg.c
  181. +2 −0 libavformat/nsvdec.c
  182. +12 −0 libavformat/rawenc.c
  183. +3 −0 libavformat/riff.c
  184. +0 −2 libavformat/rmdec.c
  185. +1 −1 libavformat/rmenc.c
  186. +1 −1 libavformat/rtsp.c
  187. +11 −7 libavformat/smjpeg.c
  188. +31 −16 libavformat/utils.c
  189. +0 −1 libavformat/vc1testenc.c
  190. +1 −1 libavformat/version.h
  191. +3 −3 libavformat/wtvdec.c
  192. +0 −1 libavformat/yuv4mpeg.c
  193. +1 −1 libavutil/avutil.h
  194. +13 −0 libavutil/common.h
  195. +3 −3 libavutil/lzo.c
  196. +1 −1 libavutil/lzo.h
  197. +5 −4 libpostproc/postprocess_template.c
  198. +2 −1 libswscale/Makefile
  199. +2 −2 libswscale/colorspace-test.c
  200. +3 −3 libswscale/ppc/yuv2rgb_altivec.h
  201. +32 −63 libswscale/swscale.c
  202. +2 −1 libswscale/swscale_unscaled.c
  203. +409 −0 libswscale/x86/output.asm
  204. +1 −381 libswscale/x86/scale.asm
  205. +14 −4 tests/Makefile
  206. +9 −4 tests/codec-regression.sh
  207. +0 −276 tests/fate.mak
  208. +30 −0 tests/fate/audio.mak
  209. +80 −0 tests/fate/demux.mak
  210. +35 −0 tests/fate/dfa.mak
  211. +42 −0 tests/fate/dpcm.mak
  212. +17 −0 tests/fate/ea.mak
  213. +74 −72 tests/fate/h264.mak
  214. +8 −8 tests/fate/image.mak
  215. +3 −0 tests/fate/libavcodec.mak
  216. +6 −6 tests/fate/lossless-audio.mak
  217. +5 −5 tests/fate/lossless-video.mak
  218. +27 −0 tests/fate/microsoft.mak
  219. +11 −0 tests/fate/mpc.mak
  220. +32 −0 tests/fate/pcm.mak
  221. +50 −0 tests/fate/qt.mak
  222. +7 −7 tests/fate/qtrle.mak
  223. +2 −2 tests/fate/real.mak
  224. +18 −15 tests/fate/screen.mak
  225. +189 −0 tests/fate/video.mak
  226. +22 −0 tests/fate/voice.mak
  227. +18 −0 tests/fate/{vp8.mak → vpx.mak}
  228. +7 −0 tests/fate/vqf.mak
  229. +0 −117 tests/fate2.mak
  230. +4 −0 tests/ref/acodec/adpcm_adx
  231. +36 −36 tests/ref/fate/cljr
  232. +25 −0 tests/ref/fate/dfa1
  233. +8 −0 tests/ref/fate/dfa10
  234. +9 −0 tests/ref/fate/dfa11
  235. +17 −0 tests/ref/fate/dfa2
  236. +10 −0 tests/ref/fate/dfa3
  237. +13 −0 tests/ref/fate/dfa4
  238. +15 −0 tests/ref/fate/dfa5
  239. +12 −0 tests/ref/fate/dfa6
  240. +12 −0 tests/ref/fate/dfa7
  241. +36 −0 tests/ref/fate/dfa8
  242. +6 −0 tests/ref/fate/dfa9
  243. 0 tests/ref/fate/{xan-dpcm → dpcm-xan}
  244. +1 −0 tests/ref/fate/dxtory
  245. +1 −0 tests/ref/fate/h264-bsf-mp4toannexb
  246. +110 −110 tests/ref/fate/interplay-mve-8bit
  247. +30 −0 tests/ref/fate/vc1_sa00050
  248. +30 −0 tests/ref/fate/vc1_sa10091
  249. +60 −0 tests/ref/fate/vc1_sa20021
  250. +10 −0 tests/ref/fate/xxan-wc4
  251. +3 −3 tests/ref/vsynth1/cljr
  252. +3 −3 tests/ref/vsynth2/cljr
  253. +1 −1 tools/patcheck
  254. +54 −54 tools/qt-faststart.c
17 changes: 15 additions & 2 deletions Changelog
View file
Expand Up @@ -6,8 +6,19 @@ version next:
- v410 Quicktime Uncompressed 4:4:4 10-bit encoder and decoder
- SBaGen (SBG) binaural beats script demuxer
- OpenMG Audio muxer
- SMJPEG demuxer
- dv: add timecode to metadata
- thumbnail video filter
- XML output in ffprobe
- asplit audio filter
- tinterlace video filter
- astreamsync audio filter
- amerge audio filter
- Automatic thread count based on detection number of (available) CPU cores
- y41p Brooktree Uncompressed 4:1:1 12-bit encoder and decoder
- ffprobe -show_error option
- Avid 1:1 10-bit RGB Packer decoder
- v308 Quicktime Uncompressed 4:4:4 encoder and decoder
- yuv4 libquicktime packed 4:2:0 encoder and decoder


version 0.9:
Expand Down Expand Up @@ -134,7 +145,7 @@ easier to use. The changes are:
- pan audio filter
- IFF Amiga Continuous Bitmap (ACBM) decoder
- ass filter
- CRI ADX audio format demuxer
- CRI ADX audio format muxer and demuxer
- Playstation Portable PMP format demuxer
- Microsoft Windows ICO demuxer
- life source
Expand All @@ -144,6 +155,8 @@ easier to use. The changes are:
- Dxtory capture format decoder
- cellauto source
- Simple segmenting muxer
- Indeo 4 decoder
- SMJPEG demuxer


version 0.8:
Expand Down
4 changes: 0 additions & 4 deletions MAINTAINERS
View file
Expand Up @@ -385,10 +385,6 @@ x86 Michael Niedermayer
Releases
========

0.5 *Deprecated/Unmaintained*
0.6 *Deprecated/Unmaintained*
0.7 Michael Niedermayer
0.8 Michael Niedermayer
0.9 Michael Niedermayer


Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Expand Up @@ -39,7 +39,7 @@ FFLIBS-$(CONFIG_SWSCALE) += swscale

FFLIBS := avutil

DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset)
DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd

SKIPHEADERS = cmdutils_common_opts.h

Expand Down