summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'd68705c9756e6558c8e28d90b4c364f25ba72083'Hendrik Leppkes2015-08-272-9/+68
|\ | | | | | | | | | | | | * 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-242-10/+69
| | | | | | | | | | | | 1440x1080@8 progressive (1259) and interlaced (1260). Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8'Hendrik Leppkes2015-08-271-31/+6
|\ \ | |/ | | | | | | | | | | * 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-241-31/+6
| |
* | Merge commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc'Hendrik Leppkes2015-08-271-113/+116
|\ \ | |/ | | | | | | | | | | * commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc': dnxhddata: Group together RUN-related tables Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Group together RUN-related tablesVittorio Giovara2015-08-241-113/+116
| | | | | | | | This helps in finding duplicates.
* | Merge commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1'Hendrik Leppkes2015-08-271-52/+10
|\ \ | |/ | | | | | | | | | | * 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-241-52/+10
| |
* | Merge commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec'Hendrik Leppkes2015-08-271-50/+52
|\ \ | |/ | | | | | | | | | | * commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec': dnxhddata: Group together DC-related tables Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Group together DC-related tablesVittorio Giovara2015-08-241-50/+52
| | | | | | | | This helps in finding duplicates.
* | Merge commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f'Hendrik Leppkes2015-08-271-9/+31
|\ \ | |/ | | | | | | | | | | * 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-241-10/+38
| |
* | Merge commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b'Hendrik Leppkes2015-08-271-23/+32
|\ \ | |/ | | | | | | | | | | * 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-241-24/+34
| | | | | | | | | | | | 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-271-4/+7
| | | | | | | | | | | | | | 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-262-0/+18
| |
* | lavf/mov: Support unusual alac files without frma and alac atoms.Carl Eugen Hoyos2015-08-271-0/+26
| | | | | | | | Fixes ticket #4747.
* | lavc/dnxhdenc: Fix ibias default.Carl Eugen Hoyos2015-08-271-1/+1
| | | | | | | | Fixes a regression since a8ab64d2 reported by Rens Dijkshoorn, rens offlinemedia nl.
* | avfilter: add hstack & vstack filterPaul B Mahol2015-08-266-1/+308
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/framesync: allocate FFFrameSyncIn internallyPaul B Mahol2015-08-265-10/+22
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/vf_histogram: fix bug in checking pixel format flagsPaul B Mahol2015-08-261-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/vf_vectorscope: fix bug in checking pixel format flagsPaul B Mahol2015-08-261-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | configure: do not fork off grep subprocess while testing for whitespaceGanesh Ajjanagadde2015-08-261-2/+3
| | | | | | | | | | | | | | | | grep is not necessary for the functionality. This avoids an unnecessary fork. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/af_aphaser: use the name 's' for the pointer to the private contextPaul B Mahol2015-08-261-61/+61
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/vf_blend: use the name 's' for the pointer to the private contextPaul B Mahol2015-08-251-39/+39
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/vdpau: fix compilation of mpeg1/mpeg4/vc1 decoders when h264 is disabledJames Almer2015-08-251-21/+23
| | | | | | | | | | | | Tested-by: wm4 <nfxjfg@googlemail.com> Tested-by: Philip Langdale <philipl@overt.org> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/segment: Do not free the filename twiceMichael Niedermayer2015-08-261-0/+1
| | | | | | | | | | | | Bug introduced in 83a508cda5115c61b456aeb227bf770d61010961 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swscale: Silence an unused variable warningTimothy Gu2015-08-251-2/+2
| | | | | | | | Also remove a pair of extraneous ifdeffery.
* | ffmpeg_opt: Add missing commaTimothy Gu2015-08-251-1/+1
| |
* | matroskaenc: Fix indentationTimothy Gu2015-08-251-18/+18
| | | | | | | | Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | lavf/http: Fix parsing http request data to not read over '\0'.Stephan Holljes2015-08-251-2/+2
| | | | | | | | Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
* | configure: aac encoder requires lpcwm42015-08-251-1/+1
| | | | | | | | Fixes compilation with --disable-encoders --enable-encoder=aac
* | checkasm: Fix floating point arguments on 64-bit WindowsHenrik Gramner2015-08-251-3/+7
| |
* | avformat/aa: use correct format specifier in sscanfVesselin Bontchev2015-08-251-2/+13
| | | | | | | | | | | | This demuxer was broken on a large number of platforms due to usage of wrong format specifier in sscanf. This patch fixes the problem, and also adds some debug logging to reduce future debugging pain.
* | lavf/segment: Fix memleak.Carl Eugen Hoyos2015-08-251-0/+1
| | | | | | | | | | Reviewed-by: Stefano Sabatini Reviewed-by: Ganesh Ajjanagadde
* | avformat/file: Check for lstat() instead of dirent.hMichael Niedermayer2015-08-252-6/+8
| | | | | | | | | | | | Fixes build on mingw Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: add tests for vectorscope filterPaul B Mahol2015-08-256-0/+35
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/dnxhd: Autodetect more valid files.Carl Eugen Hoyos2015-08-251-1/+1
| |
* | lavf/file: check for dirent.h supportMariusz Szczepańczyk2015-08-252-28/+54
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/file: implement directory listing callbacksLukasz Marek2015-08-251-0/+87
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | configure: do not fork off grep subprocess in probe_ccGanesh Ajjanagadde2015-08-251-3/+3
| | | | | | | | | | | | | | | | | | | | grep is not required for the functionality in this instance. This avoids an unnecessary fork, and also avoids a duplicated dumpversion call. Furthermore, it also corrects behavior when no minor version number is present, see e.g https://github.com/joyent/node/pull/25671. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mjpegdec: Remove message asking for a non mod 16 AMV sampleMichael Niedermayer2015-08-241-3/+0
| | | | | | | | | | | | Ticket4770 contains such a sample and it decodes fine Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/vf_vectorscope: add options with shorter namePaul B Mahol2015-08-241-0/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/vf_vectorscope: make intensity user configurablePaul B Mahol2015-08-242-5/+12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/hevc: Check num_long_term_ref_pics_sps to avoid potentially long loopsMichael Niedermayer2015-08-241-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/hevc: Fix parsing errorsArthur Grant2015-08-241-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'e23f84d9652474353d8bbc42787a56ec1991908f'Hendrik Leppkes2015-08-242-0/+2
|\ \ | |/ | | | | | | | | | | * commit 'e23f84d9652474353d8bbc42787a56ec1991908f': channel_layout: Add a 16channel default layout Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * channel_layout: Add a 16channel default layoutLuca Barbato2015-08-232-0/+3
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e'Hendrik Leppkes2015-08-240-0/+0
|\ \ | |/ | | | | | | | | | | * commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e': aac: Make sure to set err on the failure path Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * aac: Make sure to set err on the failure pathLuca Barbato2015-08-231-1/+3
| | | | | | | | Bug-Id: CID 1308153
OpenPOWER on IntegriCloud