aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* version.sh: Print versions based on the last git tag for release branchesMichael Niedermayer2014-07-281-1/+5
| | | | | | | | | | | | | | | | release branches are detected by checking if "git" is not in RELEASE This changes "N-64706-g2f71aeb" to "n2.3-8-g2f71aeb" for git master theres no change This should improve the readability of lists of versions which come from more than 1 release branch or master + release. fate.ffmpeg.org is one possible example Reviewed-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ee606fd0317df202b59946cf9b738c0a01056316) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/hevc: fix "discards const qualifier from pointer target type" warningMichael Niedermayer2014-07-281-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/hevc: add some const to cbf arraysMichael Niedermayer2014-07-281-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* hevc: clean up non relevant TODOMickaël Raulet2014-07-281-1/+0
| | | | | | cherry picked from commit a2ef95f043d89d05482af19460c9e9afdadec685 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* hevc: rename variable in boundary strength to b more explicitAnton Khirnov2014-07-283-26/+27
| | | | | | | Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr> cherry picked from commit 348bebedc0012aae201419669fca1eb61ec93ca6 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e76f2d11970484266e67a12961f2339a5c2fccf9'Michael Niedermayer2014-07-282-13/+6
|\ | | | | | | | | | | | | | | | | | | * commit 'e76f2d11970484266e67a12961f2339a5c2fccf9': hevc: eliminate the last element from TransformTree Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: eliminate the last element from TransformTreeAnton Khirnov2014-07-282-13/+7
| | | | | | | | Replace it by passing an additional parameter to transform_unit()
* | Merge commit '4aa80808bcc2a30fcd7ce5b38594319df3a85b36'Michael Niedermayer2014-07-281-2/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit '4aa80808bcc2a30fcd7ce5b38594319df3a85b36': hevc: eliminate unnecessary cbf_c{b,r} arrays Conflicts: libavcodec/hevc.c See: 77ef9fd1e938010600620c1d32cabd15e7d5b853 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: eliminate unnecessary cbf_c{b,r} arraysAnton Khirnov2014-07-282-41/+22
| | | | | | | | | | They are replaced by passing additional parameters to the transform functions.
* | Merge commit '0daa2554636ba1d31f3162ffb86991e84eb938a8'Michael Niedermayer2014-07-282-9/+6
|\| | | | | | | | | | | | | * commit '0daa2554636ba1d31f3162ffb86991e84eb938a8': hevc: do not store the transform inter_split flag in the context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: do not store the transform inter_split flag in the contextAnton Khirnov2014-07-282-9/+6
| | | | | | | | It does not need to be preserved.
* | Merge commit '53a11135f2fb2123408b295f9aaae3d6f861aea5'Michael Niedermayer2014-07-281-22/+18
|\| | | | | | | | | | | | | | | | | | | * commit '53a11135f2fb2123408b295f9aaae3d6f861aea5': hevc: simplify splitting the transform tree blocks Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: simplify splitting the transform tree blocksAnton Khirnov2014-07-281-22/+17
| |
* | Merge commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be'Michael Niedermayer2014-07-281-4/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be': hevc: eliminate an unnecessary array Conflicts: libavcodec/hevc.c See: 255086a7e06417d98417cea192053b8a8531eb24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: eliminate an unnecessary arrayAnton Khirnov2014-07-282-10/+5
| | | | | | | | We do not need to store the value of the split flag.
* | Merge commit '4b169321b84502302f2badb056ebee4fdaea94fa'Michael Niedermayer2014-07-280-0/+0
|\| | | | | | | | | | | | | | | | | * commit '4b169321b84502302f2badb056ebee4fdaea94fa': codec_desc: fix some typos in long codec names See: 60b59d657e4d2c710391b8238533c2f3a51086f7 See: c3ca70204bd816bcef59c3d278b3d8607e2525ca Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * codec_desc: fix some typos in long codec namesAnton Khirnov2014-07-281-2/+2
| | | | | | | | The rv20 typo spotted by Hendrik Leppkes <h.leppkes@gmail.com>
* | Merge commit 'c5fca0174db9ed45be821177f49bd9633152704d'Michael Niedermayer2014-07-284-17/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c5fca0174db9ed45be821177f49bd9633152704d': lavc: add a property for marking codecs that support frame reordering Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add a property for marking codecs that support frame reorderingAnton Khirnov2014-07-284-17/+30
| |
* | MAINTAINERS: update list of releases i maintainMichael Niedermayer2014-07-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_spp: support setting dct avoptions from the filter graph stringMichael Niedermayer2014-07-281-3/+34
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_scale: fix log message categoryMichael Niedermayer2014-07-281-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/avdct: Add avcodec_dct_get_class()Michael Niedermayer2014-07-282-0/+7
| | | | | | | | | | | | This should have been in the initial commit of AVDCT Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | RELEASE: update, we are after 2.3 not 2.2Michael Niedermayer2014-07-281-1/+1
| | | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: eliminate unnecessary cbf_c{b,r} arraysAnton Khirnov2014-07-282-64/+37
| | | | | | | | | | | | | | | | | | | | - They are be replaced by passing additional parameters to the transform functions. - Adaptation to 4:2:2 Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr> cherry picked from commit f518bb22531c648f1c37f978b0c7ad2e71e04c25 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: fix skip_flagMickaël Raulet2014-07-282-11/+12
| | | | | | | | | | | | cherry picked from commit 509ae456551005b9bf9b4d9730b6247c97fdd990 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: remove non necessary parameters to ff_hevc_set_qpyMickaël Raulet2014-07-283-8/+6
| | | | | | | | | | | | cherry picked from commit 6f58c111ad9920d983bb18eacf901193bac5d937 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/decoders: mention native Opus decoderLou Logan2014-07-271-0/+3
| | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* | Fix standalone compilation of the webm_dash_manifest demuxer.Carl Eugen Hoyos2014-07-271-0/+1
| |
* | Fix standalone compilation of the legacy mpegvideo decoder.Carl Eugen Hoyos2014-07-271-0/+1
| | | | | | | | Second try.
* | Fix standalone compilation of the legacy mpegvideo decoder.Carl Eugen Hoyos2014-07-271-2/+1
| |
* | fate/hevc: update fate with 9 bitstreamsMickaël Raulet2014-07-2710-0/+430
| | | | | | | | | | | | | | | | - all of them testing HEVC version 1 cherry picked from commit adcdabb4dd062694fb8de6df0faecaad1c36ba33 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5'Michael Niedermayer2014-07-271-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5': fate: support testing of release branches Conflicts: tests/fate.sh The communication protocol is left at version 0 as our fate server hasnt been updated to support this yet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: support testing of release branchesJanne Grunau2014-07-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding 'branch=release/10' to the fate config file will check the release/10 branch instead of master. If no branch is specified it will use 'master' so that existing config are still valid. The server side changes are already deployed, see https://fate.libav.org/v10/ for an example. The server supports only the release/* branches. The server enforces that a single slot tests always the same branch. Please append "-v$RELEASE" to the slot of release branch configs or make the slot otherwise unique. A different fate samples dir is needed for each release branch. make fate-rsync has the correct URL in each branch.
* | configure: fix memalign hack auto detectionMichael Niedermayer2014-07-271-1/+1
| | | | | | | | | | | | Should fix fate on haiku Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/examples/muxing: fix "-flags" optionMichael Niedermayer2014-07-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: hevc_mc: load less data in epel filtersChristophe Gisquet2014-07-271-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | Before: 5679 decicycles in epel_bi, 2059976 runs, 37176 skips 3468 decicycles in epel_uni, 1040886 runs, 7690 skips After: 5323 decicycles in epel_bi, 2059493 runs, 37659 skips 3262 decicycles in epel_uni, 1040871 runs, 7705 skips Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: hevc_mc: replace one lea by addChristophe Gisquet2014-07-271-1/+1
| | | | | | | | | | | | Should have been in 036f11bdb565. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_spp: use AVDCTMichael Niedermayer2014-07-272-10/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: add avdctMichael Niedermayer2014-07-275-1/+200
| | | | | | | | | | | | | | | | | | | | | | | | This provides a public sustainable API/ABI for DCT functions. Only externally used dct functions are included. The structure is extensible without ABI issues compared to the existing dct contexts. See Mailing list and IRC log of 2014-07-26/27 Reviewed-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ppc/idctdsp: Only select non bitexact IDCTs by default when bitexact ↵Michael Niedermayer2014-07-271-1/+1
| | | | | | | | | | | | is not set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/arm/idctdsp_init_arm*: Only select non bitexact IDCTs by default ↵Michael Niedermayer2014-07-272-2/+2
| | | | | | | | | | | | when bitexact is not set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c'Michael Niedermayer2014-07-271-19/+22
|\| | | | | | | | | | | | | | | | | | | * commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c': eamad: use the bytestream2 API instead of AV_RL Conflicts: libavcodec/eamad.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * eamad: use the bytestream2 API instead of AV_RLAnton Khirnov2014-07-271-17/+20
| | | | | | | | | | | | This is safer and possibly fixes invalid reads on truncated data. CC:libav-stable@libav.org
* | doc/examples/muxing: Exchange tmp_frame and frameMichael Niedermayer2014-07-271-11/+12
| | | | | | | | | | | | Reduces difference to 56f98e340fca894a76d1ddbe33118b8d8c4db34a Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264_mp4toannexb_bsf: fix issue when sps/pps are already in the bistreamChris \"Koying\" Browet2014-07-271-3/+11
| |
* | fate/hevc: adding CONFWIN_A conformance testMickaël Raulet2014-07-272-0/+62
| | | | | | | | | | | | cherry picked from commit 3b69a2dc469160ee87367191e630e8398e832227 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate/hevc: add flags unalignedMickaël Raulet2014-07-271-6/+6
| | | | | | | | | | | | cherry picked from commit 3b69a2dc469160ee87367191e630e8398e832227 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate/hevc: add BUMPING bitstream testMickaël Raulet2014-07-272-0/+51
| | | | | | | | | | | | cherry picked from commit d4d61a071f087db2a4bc2b49559d40dd350a841e Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'Michael Niedermayer2014-07-272-2/+3
|\| | | | | | | | | | | | | * commit '7215fcf84032118ecd9fb54fb14154d69fea638d': avformat: Mark AVOutputFormat argument in avformat_query_codec as const Merged-by: Michael Niedermayer <michaelni@gmx.at>