Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-08 10:50:02 +00:00
Code Issues Projects Releases Packages Wiki Activity
57769 commits 38 branches 415 tags 286 MiB
Commit graph

25976 commits

Author SHA1 Message Date
Michael Niedermayer
382545ae62 Merge commit '28240a60c1' 
* commit '28240a60c1':
  lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:20:02 +01:00
Michael Niedermayer
935d0ee08d Merge commit 'eb5920c195' 
* commit 'eb5920c195':
  lavc: deprecate unused FF_BUG_OLD_MSMPEG4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:12:13 +01:00
Michael Niedermayer
7592d30bcb Merge commit '0300962b76' 
* commit '0300962b76':
  lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:03:19 +01:00
Michael Niedermayer
9bcf647867 avcodec: document that FF_DEBUG_VIS_QP / FF_DEBUG_VIS_MB_TYPE should only be used through avoptions 
This preempts ABI issues if their values get reused by the fork for something unrelated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 18:53:01 +01:00
Michael Niedermayer
2a2cc0af6d Merge commit 'f8b2bcd2ad' 
* commit 'f8b2bcd2ad':
  lavc: deprecate FF_DEBUG_VIS_*

leave the AVOptions as they work fine

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 18:51:34 +01:00
Michael Niedermayer
f49e6359b6 avcodec/avcodec.h: move debug_mv to the end of the struct with the next ABI bump 
This maintains ABI compatibility
also add a note that debug_mv must be accessed through AVOptions (for ABI)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 18:38:51 +01:00
Michael Niedermayer
66df6f5407 Merge commit 'a1504eee41' 
* commit 'a1504eee41':
  lavc: deprecate AVCodecContext.debug_mv

Conflicts:
	libavcodec/options_table.h

Not merged, debug_mv works fine

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 18:36:46 +01:00
Michael Niedermayer
c6c03dfdf1 Merge commit 'ccc7129845' 
* commit 'ccc7129845':
  lavc: deprecate FF_DEBUG_MV and remove all traces of its use

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 18:22:42 +01:00
Michael Niedermayer
5eb1704d5f Merge commit '064698d381' 
* commit '064698d381':
  Add HEVC decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/hevc.c
	libavcodec/hevc.h
	libavcodec/hevc_cabac.c
	libavcodec/hevc_filter.c
	libavcodec/hevc_mvs.c
	libavcodec/hevc_parser.c
	libavcodec/hevc_ps.c
	libavcodec/hevc_refs.c
	libavcodec/hevc_sei.c
	libavcodec/hevcdsp.c
	libavcodec/hevcdsp_template.c
	libavcodec/hevcpred.c
	libavcodec/hevcpred_template.c
	libavcodec/version.h

cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 17:13:00 +01:00
Michael Niedermayer
8b2dd04afc Merge commit '0a9e94bba8' 
* commit '0a9e94bba8':
  webp: stop using deprecated avcodec_set_dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:55:58 +01:00
Michael Niedermayer
98ca3fb9cf Merge commit '757d5e8ef9' 
* commit '757d5e8ef9':
  vp8: stop using deprecated avcodec_set_dimensions
  vp56: stop using deprecated avcodec_set_dimensions
  vp3: stop using deprecated avcodec_set_dimensions
  txd: stop using deprecated avcodec_set_dimensions
  truemotion1: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/txd.c
	libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:49:58 +01:00
Michael Niedermayer
ffd100b111 Merge commit 'c265b8bb76' 
* commit 'c265b8bb76':
  tiff: stop using deprecated avcodec_set_dimensions
  targa: stop using deprecated avcodec_set_dimensions
  svq1dec: stop using deprecated avcodec_set_dimensions
  sunrast: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/sunrast.c
	libavcodec/targa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:43:29 +01:00
Michael Niedermayer
7630e564ca Merge commit 'c755870d52' 
* commit 'c755870d52':
  sgidec: stop using deprecated avcodec_set_dimensions
  rv34: stop using deprecated avcodec_set_dimensions
  rv10: stop using deprecated avcodec_set_dimensions
  ptx: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/ptx.c
	libavcodec/rv10.c
	libavcodec/sgidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:34:49 +01:00
Michael Niedermayer
a897ba33e8 Merge commit '0f21d8b1b4' 
* commit '0f21d8b1b4':
  pictordec: stop using deprecated avcodec_set_dimensions
  pgssubdec: stop using deprecated avcodec_set_dimensions
  pcx: stop using deprecated avcodec_set_dimensions
  mpegvideo_parser: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/pcx.c
	libavcodec/pgssubdec.c
	libavcodec/pictordec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:25:09 +01:00
Michael Niedermayer
64a0ed190e Merge commit '13207484bb' 
* commit '13207484bb':
  mpeg4video_parser: stop using deprecated avcodec_set_dimensions
  mpeg12dec: stop using deprecated avcodec_set_dimensions
  mjpegdec: stop using deprecated avcodec_set_dimensions
  libvpxdec: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:14:52 +01:00
Michael Niedermayer
bf92cd8178 Merge commit '967cd6fafb' 
* commit '967cd6fafb':
  libopenjpegdec: stop using deprecated avcodec_set_dimensions
  kgv1dec: stop using deprecated avcodec_set_dimensions
  ivi_common: stop using deprecated avcodec_set_dimensions
  indeo3: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/ivi_common.c
	libavcodec/kgv1dec.c
	libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:07:25 +01:00
Michael Niedermayer
e6b9d71ad9 Merge commit '3b08631727' 
* commit '3b08631727':
  h26[13]dec: stop using deprecated avcodec_set_dimensions
  gifdec: stop using deprecated avcodec_set_dimensions
  g2meet: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/gifdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 14:54:40 +01:00
Michael Niedermayer
bf688d23b5 Merge commit 'ec7063005e' 
* commit 'ec7063005e':
  eatqi: stop using deprecated avcodec_set_dimensions
  eatgv: stop using deprecated avcodec_set_dimensions
  eatgq: stop using deprecated avcodec_set_dimensions
  eamad: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 14:09:17 +01:00
Michael Niedermayer
4a35651267 Merge commit 'd6da372984' 
* commit 'd6da372984':
  eacmv: stop using deprecated avcodec_set_dimensions
  dvdsubdec: stop using deprecated avcodec_set_dimensions
  dvdec: stop using deprecated avcodec_set_dimensions
  dpx: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/dpx.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/eacmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 14:01:02 +01:00
Michael Niedermayer
f016a23c7f Merge commit 'c7a5acabc5' 
* commit 'c7a5acabc5':
  dnxhddec: stop using deprecated avcodec_set_dimensions
  dirac: stop using deprecated avcodec_set_dimensions
  cdxl: stop using deprecated avcodec_set_dimensions
  avs: stop using deprecated avcodec_set_dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 13:40:04 +01:00
Michael Niedermayer
5ef0c00580 Merge commit '78780c8bf6' 
* commit '78780c8bf6':
  ansi: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/ansi.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 13:28:33 +01:00
Michael Niedermayer
66f436adf5 Merge commit '0f6c1d6d64' 
* commit '0f6c1d6d64':
  lavc/utils: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 13:21:14 +01:00
Michael Niedermayer
7b91e9cf5d Merge commit '7644f5a807' 
* commit '7644f5a807':
  lavc: replace avcodec_set_dimensions with ff_set_dimensions

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 13:07:15 +01:00
Michael Niedermayer
f62dfed3de h264: simplify frame_recovered code 
This is a separate commit to ease future bisecting in case it breaks something.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 12:59:40 +01:00
Michael Niedermayer
78265fcfee Merge commit '28096e0a80' 
* commit '28096e0a80':
  h264: wait for initial complete frame before outputing frames

Conflicts:
	doc/APIchanges
	libavcodec/h264.c
	libavcodec/mpegvideo.h
	libavutil/frame.h
	libavutil/version.h

See: a64b028aeb (as well as various later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 12:59:08 +01:00
Michael Niedermayer
a2bfee36b7 Merge commit '9af7a8523a' 
* commit '9af7a8523a':
  HNM4/HNM4A demuxer & video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 10:46:39 +01:00
Michael Niedermayer
ec5e02d495 avcodec/wmv2enc: Collect statistics for 2 pass encoding 
Fixes Ticket3053

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 00:40:33 +01:00
Compn
6173b0fea7 aacdec: fix small comment, update decoder features comment 2013-10-31 15:57:16 -04:00
Anton Khirnov
28240a60c1 lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h 
It's for internal use only.
 2013-10-31 20:24:48 +01:00
Anton Khirnov
eb5920c195 lavc: deprecate unused FF_BUG_OLD_MSMPEG4 2013-10-31 20:24:30 +01:00
Anton Khirnov
0300962b76 lavc: schedule FF_BUG_AC_VLC for removal on the next major bump. 
It has been deprecated/unused for about 10 years.
 2013-10-31 20:23:42 +01:00
Anton Khirnov
f8b2bcd2ad lavc: deprecate FF_DEBUG_VIS_* 
Those flags have no effect since
37045e4229.
 2013-10-31 20:23:08 +01:00
Anton Khirnov
a1504eee41 lavc: deprecate AVCodecContext.debug_mv 
It has been unused since 37045e4229.
 2013-10-31 20:22:51 +01:00
Anton Khirnov
ccc7129845 lavc: deprecate FF_DEBUG_MV and remove all traces of its use 
It has not been actually used since
37045e4229, when the broken vismv code was
removed.
 2013-10-31 20:21:13 +01:00
Guillaume Martres
064698d381 Add HEVC decoder 
Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC
project. Further contributions by the OpenHEVC project and other
developers, namely:

Mickaël Raulet <mraulet@insa-rennes.fr>
Seppo Tomperi <seppo.tomperi@vtt.fi>
Gildas Cocherel <gildas.cocherel@laposte.net>
Khaled Jerbi <khaled_jerbi@yahoo.fr>
Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr>
Vittorio Giovara <vittorio.giovara@gmail.com>
Jan Ekström <jeebjp@gmail.com>
Anton Khirnov <anton@khirnov.net>
Martin Storsjö <martin@martin.st>
Luca Barbato <lu_zero@gentoo.org>
Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun <diego@biurrun.de>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-31 20:19:59 +01:00
Carl Eugen Hoyos
5ab1efb9d0 Fix a crash on oom when decoding hevc. 2013-10-31 20:17:18 +01:00
Anton Khirnov
0a9e94bba8 webp: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
757d5e8ef9 vp8: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
c265b8bb76 tiff: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
c755870d52 sgidec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
0f21d8b1b4 pictordec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
2e0ab4d314 vp56: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
eed5a478ba targa: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
1d389e2a80 rv34: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
41ad353dcf pgssubdec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
b53febc1c0 vp3: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
7fbb75cc70 svq1dec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
ce9f5b13ed rv10: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
0679416269 pcx: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
3cfdb912cb txd: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00