summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* aac: move the TNS tables from aacdectab to the shared aactabRostislav Pehlivanov2015-08-29
| | | | | | | | | | | | This commit simply moves the TNS tables to a more appropriate aactab.h since then they can be accessed by both the decoder and encoder. The encoder _shouldn't_ normally need the tables since the specs describe a specific quantization process, but the exact reason for this can be seen in the TNS commit following. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* avcodec/vc1dec: Re-order init to avoid initting hwaccel too earlyPhilip Langdale2015-08-28
| | | | | | | | | | | | | | | | | | | | | | At least for vdpau, the hwaccel init code tries to check the video profile and ensure that there is a matching vdpau profile available. If it can't find a match, it will fail to initialise. In the case of wmv3/vc1, I observed initialisation to fail all the time. It turns out that this is due to the hwaccel being initialised very early in the codec init, before the profile has been extracted and set. Conceptually, it's a simple fix to reorder the init code, but it gets messy really fast because ff_get_format(), which is what implicitly trigger hwaccel init, is called multiple times through various shared init calls from h263, etc. It's incredibly hard to prove to my own satisfaction that it's safe to move the vc1 specific init code ahead of this generic code, but all the vc1 fate tests pass, and I've visually inspected a couple of samples and things seem correct. Signed-off-by: Philip Langdale <philipl@overt.org>
* ffmpeg: force 128k default audio bitrate if nothing is specified and there ↵Michael Niedermayer2015-08-28
| | | | | | | | is no specific default This prevents breaking existing command lines in case the "ab" default is removed from libavcodec Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_dejudder: use the name 's' for the pointer to the private contextPaul B Mahol2015-08-28
| | | | | | This is shorter and consistent across filters. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* ffserver: use -b instead of -ab for setting audio bitrate.Ronald S. Bultje2015-08-28
|
* Put remaining pieces of CODEC_FLAG_EMU_EDGE under FF_API_EMU_EDGE.Ronald S. Bultje2015-08-28
| | | | | | The amv one probably looks suspicious, but since it's an intra-only codec, I couldn't possibly imagine what it would use the edge for, and the vsynth fate result doesn't change, so it's probably OK.
* Changelog: Add VDPAU HEVC to the listPhilip Langdale2015-08-28
| | | | Signed-off-by: Philip Langdale <philipl@overt.org>
* avfilter/vf_histogram: 9 and 10 bit depth supportPaul B Mahol2015-08-28
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* doc/examples/filtering_video: better demo ffmpeg filters; demos chaining the ↵Harshit Mittal2015-08-28
| | | | | | filters Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Changelog: Clarify that the new asf demuxer is optional.Carl Eugen Hoyos2015-08-28
|
* Changelog: Mention the change of the default webm codecs.Thilo Borgmann2015-08-28
| | | | Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* configure: Do not let the webm muxer suggest external libraries.Carl Eugen Hoyos2015-08-28
| | | | This can fail as seen on fate and the usefulness of the suggestion is limited.
* apng: Support inter-frame compressionDonny Yang2015-08-28
| | | | | | | | | The current algorithm is just "try all the combinations, and pick the best". It's not very fast either, probably due to a lot of copying, but will do for an initial implementation. Signed-off-by: Donny Yang <work@kota.moe> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/dnxhddata: Fix inconsistent table entryMichael Niedermayer2015-08-28
| | | | | | | Fixes segfault Fixes Ticket4809 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* configure: Print out enabled programsrogerdpack2015-08-27
| | | | | | | | | | | Better message that ffplay is not going to be built by printing out what will be built. Based on a patch by Moritz Barsnick. Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu> Signed-off-by: Timothy Gu <timothygu99@gmail.com>
* avformat/segment: atomically update list if possibleMichael Niedermayer2015-08-28
| | | | | | Fixes Ticket4802 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffplay: remove unused include libavutil/colorspace.hZhang Rui2015-08-28
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/af_amerge: use the name 's' for the pointer to the private contextGanesh Ajjanagadde2015-08-27
| | | | Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* avfilter: add framerate video filterPaul B Mahol2015-08-27
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavf/mpegenc: provide better feedback in case of invalid media typeStefano Sabatini2015-08-27
|
* avcodec: Assert on codec->encode2 in encode_audio2lummax2015-08-27
| | | | | | | | | | | | | | Assert on `avctx->codec->encode2` to avoid a SEGFAULT on the subsequent function call. avcodec_encode_video2() uses a similar assertion. Calling the wrong function on a stream is a serious inconsistency which could at other places be potentially dangerous and exploitable, it is thus safer to stop execution and not continue with such inconsistency after returning an error. Commit-message-extended-by commiter Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* vaapi: Add hevc hwaccel supportTimo Rothenpieler2015-08-27
| | | | Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
* configure: warn if GCC 4.2 is being usedGanesh Ajjanagadde2015-08-27
| | | | | | | The wiki, Ticket1464, and Ticket3970 warn about the usage of GCC 4.2. This fixes Ticket3970. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* lavc: Describe eia_608 as text subtitles.Carl Eugen Hoyos2015-08-27
|
* avcodec/libopusenc: Fix infinite loop on flushing after 0 inputMichael Niedermayer2015-08-27
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* configure: remove unused apply() functionGanesh Ajjanagadde2015-08-27
| | | | | Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04'Hendrik Leppkes2015-08-27
|\ | | | | | | | | | | | | * commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04': webm: Explicitly select libvpx, libopus and libvorbis encoders Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * webm: Explicitly select libvpx, libopus and libvorbis encodersLuca Barbato2015-08-25
| | | | | | | | | | | | | | | | And update the preference for the newer codecs now that the libraries seem stable and widespread enough. Bug-Id: 695 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '413d4e54a9bffe2d0afdc6d8a80f516e5df6a421'Hendrik Leppkes2015-08-27
|\| | | | | | | | | | | | | | | | | * commit '413d4e54a9bffe2d0afdc6d8a80f516e5df6a421': nvenc: Properly free the fifos Not merged, ffmpeg's nvenc doesn't use these fifos. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * nvenc: Properly free the fifosLuca Barbato2015-08-25
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '2157df425bd909854fd4afcec4aa3311d8a3b31b'Hendrik Leppkes2015-08-27
|\| | | | | | | | | | | | | | | | | * commit '2157df425bd909854fd4afcec4aa3311d8a3b31b': hlsenc: Support outputting specific versions Not merged, the version is auto-selected in ffmpeg based on enabled features. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * hlsenc: Support outputting specific versionsLuca Barbato2015-08-25
| | | | | | | | | | | | Right now only version 2 and version 3 are supported. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'd68705c9756e6558c8e28d90b4c364f25ba72083'Hendrik Leppkes2015-08-27
|\| | | | | | | | | | | | | * commit 'd68705c9756e6558c8e28d90b4c364f25ba72083': dnxhddata: Add tables for missing DNx100 profiles Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Add tables for missing DNx100 profilesVittorio Giovara2015-08-24
| | | | | | | | | | | | 1440x1080@8 progressive (1259) and interlaced (1260). Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8'Hendrik Leppkes2015-08-27
|\| | | | | | | | | | | | | * commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8': dnxhddata: Merge a few duplicated RUN tables Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Merge a few duplicated RUN tablesVittorio Giovara2015-08-24
| |
* | Merge commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc'Hendrik Leppkes2015-08-27
|\| | | | | | | | | | | | | * commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc': dnxhddata: Group together RUN-related tables Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Group together RUN-related tablesVittorio Giovara2015-08-24
| | | | | | | | This helps in finding duplicates.
* | Merge commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1'Hendrik Leppkes2015-08-27
|\| | | | | | | | | | | | | * commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1': dnxhddata: Merge a few duplicated DC tables Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Merge a few duplicated DC tablesVittorio Giovara2015-08-24
| |
* | Merge commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec'Hendrik Leppkes2015-08-27
|\| | | | | | | | | | | | | * commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec': dnxhddata: Group together DC-related tables Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Group together DC-related tablesVittorio Giovara2015-08-24
| | | | | | | | This helps in finding duplicates.
* | Merge commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f'Hendrik Leppkes2015-08-27
|\| | | | | | | | | | | | | * commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f': dnxhddata: List the reused tables in a comment Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: List the reused tables in a commentVittorio Giovara2015-08-24
| |
* | Merge commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b'Hendrik Leppkes2015-08-27
|\| | | | | | | | | | | | | * commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b': dnxhddata: Keep a single CID in the table names Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Keep a single CID in the table namesVittorio Giovara2015-08-24
| | | | | | | | | | | | Use a comment to list the reused tables, since it's more flexible than a table name to keep information like this. The list will expand in later commits.
* | avformat/oggenc: Check segments_count for headers tooMichael Niedermayer2015-08-27
| | | | | | | | | | | | | | Fixes infinite loop and segfault in ogg_buffer_data() Fixes Ticket4806 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg_opt: Add -hwaccels option that lists all supported hwaccelsTimothy Gu2015-08-26
| |
* | lavf/mov: Support unusual alac files without frma and alac atoms.Carl Eugen Hoyos2015-08-27
| | | | | | | | Fixes ticket #4747.
* | lavc/dnxhdenc: Fix ibias default.Carl Eugen Hoyos2015-08-27
| | | | | | | | Fixes a regression since a8ab64d2 reported by Rens Dijkshoorn, rens offlinemedia nl.