ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-30 18:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,769 Commits 37 Branches 400 Tags 502 MiB
382545ae62
Commit Graph

4220 Commits

Author SHA1 Message Date
Michael Niedermayer
b594aceb94 Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99' 
* commit '5846646296e377e093441dfe9eadde38ff1f7c99':
  Add raw HEVC demuxer

Conflicts:
	Changelog
	libavformat/hevcdec.c
	libavformat/version.h

See: 902a5fa722 and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 17:33:05 +01:00
Michael Niedermayer
5eb1704d5f Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942' 
* commit '064698d381e1e7790f21b0199a8930ea04e2e942':
  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
78265fcfee Merge commit '28096e0a806e57376541e6222d315619906e3c55' 
* commit '28096e0a806e57376541e6222d315619906e3c55':
  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
Stefano Sabatini
2acc525d78 doc/encoders: add libfaac encoder documentation 2013-11-01 12:51:39 +01:00
Stefano Sabatini
d339e03fc3 doc/encoders: document the libfdk-aac wrapper 
Partially based on the https://trac.ffmpeg.org/wiki/AACEncodingGuide
guide.
 2013-11-01 12:51:39 +01:00
Stefano Sabatini
4fdec65eb3 doc/encoders: extend/clarify libtheora encoder documentation 2013-11-01 12:51:39 +01:00
Michael Niedermayer
a2bfee36b7 Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' 
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
  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
Dirk Farin
5846646296 Add raw HEVC demuxer 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-31 20:20:24 +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
John Stebbins
28096e0a80 h264: wait for initial complete frame before outputing frames 
This can be optionally disabled whith the "output_corrupt" flags
option.  When in "output_corrupt" mode, incomplete frames are
signalled through AVFrame.flags FRAME_FLAG_INCOMPLETE_FRAME.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-31 20:14:14 +01:00
David Kment
9af7a8523a HNM4/HNM4A demuxer & video decoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-10-31 17:45:46 +01:00
Paul B Mahol
49287bbfd3 doc/filters: add few more examples for blend filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-31 13:36:57 +00:00
Clément Bœsch
0c6bb53bb2 doc/examples/demuxing: reset got_frame. 
Fix infinite loop at flushing.
 2013-10-30 14:37:58 +01:00
Stefano Sabatini
9fa0dccca6 lavc: extend documentation for the "bf" option 2013-10-29 18:30:27 +01:00
Stefano Sabatini
61c1f2cb1e doc/muxers: add definitory line for the MOV/MP4/ISMV muxer 
Also rename section name, to match the other ones adopting the muxer name
(rather than the related upcased standard name).
 2013-10-29 18:30:27 +01:00
Michael Niedermayer
0fef19b15a doc/RELEASE_NOTES: update for 2.1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 01:13:46 +01:00
Michael Niedermayer
b85bf3423c doc/APIchanges: add 2 missing hashes & versions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 00:45:19 +01:00
Marton Balint
dbe6f9f2c2 lavc: add support for CODEC_CAP_DELAY in subtitles 
This patch adds CODEC_CAP_DELAY support to avcodec_decode_subtitle2.

For DVB teletext decoding, a single teletext packet can contain multiple
teletext pages. In order to support that, the teletext decoder may buffer
some pages.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-27 23:12:41 +01:00
Paul B Mahol
292902ea9f avfilter: add mergeplanes filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-27 18:58:43 +00:00
Stefano Sabatini
5b53dd0803 doc/encoders: replace @xref with @ref command 
@xref is ignored by texi2pod.
 2013-10-27 15:32:25 +01:00
Timothy Gu
43041a7b4a doc/encoders: add libshine doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-27 13:02:32 +01:00
Stefano Sabatini
d3aa04b150 doc/protocols/rtp: apply misc fixes 
Partially suggested-by Burek Pekaric <burek021@gmail.com>.
 2013-10-27 12:44:48 +01:00
Stefano Sabatini
4e268285aa cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
Stefano Sabatini
d61617a523 lavu/parseutils: add av_get_known_color_name() 2013-10-27 09:16:05 +01:00
Michael Niedermayer
444ce03f0f Merge remote-tracking branch 'cus/stable' 
* cus/stable:
  ffplay: add support for libswresample options
  ffplay: use av_frame_get_pkt_pos instead directly accessing pkt pos
  ffplay: factor out picture freeing code
  ffplay: update and extend documentation for channel and stream switching

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 13:54:29 +02:00
Marton Balint
060c42bc3d ffplay: update and extend documentation for channel and stream switching 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-26 12:23:54 +02:00
Michael Niedermayer
6889b78fe0 doc/issue_tracker: add 2 missing issue types 
Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-26 11:29:42 +02:00
Stefano Sabatini
b4991292aa doc: add a few links to the Channel Layout syntax section 2013-10-25 15:44:12 +02:00
Stefano Sabatini
a3505136f9 doc/utils: document channel layout specification 2013-10-25 15:44:04 +02:00
Michael Niedermayer
52297945ec doc/issue_tracker: remove more mentions of patches 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 12:03:35 +02:00
Michael Niedermayer
cdb46f15ff doc/issue_tracker: update resolution names 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 11:36:46 +02:00
Michael Niedermayer
2a28bad822 doc/issue_tracker: remove patches as we dont use trac to handle patches 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 11:36:29 +02:00
Michael Niedermayer
3db7ae6a9a doc/issue_tracker: theres no substatus in trac 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-25 11:34:18 +02:00
Stefano Sabatini
af1c538850 doc/Makefile: fix man pages uninstall path 
Fix trac ticket #3054.
 2013-10-24 21:19:52 +02:00
burek
229042a52d doc/protocols: add description for the RTP protocol 
With some edits by Stefano.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-24 21:19:45 +02:00
Timothy Gu
6879fe4265 doc/codecs: update skip_alpha documentation 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-24 11:32:56 +02:00
Timothy Gu
0be74cf0f5 doc/encoders: add libvorbis doc 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-24 11:32:56 +02:00
Lukasz Marek
759388aa71 lavd: add fbdev output device 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-24 08:16:17 +02:00
Luca Barbato
f825d42bcc avplay: Accept cpuflags option 
Quite useful for debugging.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-22 10:49:31 +02:00
Paul B Mahol
c9660999b9 avfilter: replaygain scanner 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-21 19:56:55 +00:00
Michael Niedermayer
a6388616e8 doc/developer: Add a policy item about updating the MAINTAINERs file 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 15:20:03 +02:00
Lukasz Marek
fb74c7e044 lavd/pulse_audio_dec: apply cosmetic changes 
In particular, fix punctuation in docs and make option help messages
grammatically consistent.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-18 23:26:55 +02:00
Stefano Sabatini
8696e51baf lavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functions 
The new type is compatible with AV_OPT_TYPE_INT64, but allows to specify
channel layouts using the format accepted by av_get_channel_layout().
 2013-10-17 18:09:29 +02:00
Michael Niedermayer
9a63a45e48 doc/utils: fix docs build 
Not sure this is the correct solution but that can be investigated too once
the docs build again

Tested-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-16 22:32:47 +02:00
Timothy Gu
586b8ea248 doc/filters: reference ffmpeg-utils manual for color and sizes options 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-16 18:32:15 +02:00
Timothy Gu
155a5ff00d doc/utils: reformat doc for color syntax and add list of supported colors 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-16 18:32:15 +02:00
Timothy Gu
b4da1fa550 doc/utils: rewrite doc for time duration syntax 
Extend description and clarify syntax.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-16 18:32:15 +02:00
Lou Logan
a06dcde507 doc: make x11grab examples consistent with option names 
Change -r to -framerate, but either will work.
Change -s to -video_size, but either will work.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-14 23:08:52 +02:00
Michael Niedermayer
4b948dcadb doc/developer: Merge license related policy items 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-13 10:46:32 +02:00
Timothy Gu
024bf3a1c2 doc/codecs: Add missing mpeg2 aac profiles 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-11 20:00:06 +02:00