aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avformat/version: Bump version for single jpeg muxerMichael Niedermayer2015-06-081-2/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/ffserver: Add entry for missing jpeg variantMichael Niedermayer2015-06-081-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffserver: Use singlejpeg muxer for jpegCaligula useraccount2015-06-083-2/+9
| | | | | | | Fixes Ticket4218 Based on patch by: Otávio Ribeiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat: Add single jpeg muxerCaligula useraccount2015-06-083-0/+13
| | | | | | | Needed to fix Ticket4218 Based on patch by: Otávio Ribeiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/aacdec: Do not return a uninitialized valueMichael Niedermayer2015-06-081-1/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'bc76c46943272515805d7ac48ca39f14826d1fed'Michael Niedermayer2015-06-081-0/+8
|\ | | | | | | | | | | | | | | | | | | | | * commit 'bc76c46943272515805d7ac48ca39f14826d1fed': aac: Wait to know the channels before allocating frame Conflicts: libavcodec/aacdec.c See: 676a395ab903cac623c5d6ddd0928c789e08a59e Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Wait to know the channels before allocating frameLuca Barbato2015-06-071-2/+11
| | | | | | | | | | | | | | | | The channel configuration can be delivered only by the PCE, try to parse it first and not try to decode until a channel configuration is set. CC: libav-stable@libav.org
* | Merge commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3'Michael Niedermayer2015-06-082-5/+27
|\| | | | | | | | | | | | | * commit 'a188108ebf28ebac9d2b8fc7d5b391aef45698b3': aac: Support channel configurations 11 and 12 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: Support channel configurations 11 and 12Sebastian Dröge2015-06-072-5/+27
| | | | | | | | | | | | | | | | | | | | | | These are defined in ISO/IEC 14496-3:2009/PDAM 4 for 6.1 and 7.1. It also defines another 7.1 layout with configuration 14, that one is not added here for now. 11: 3/3.1 FC FL+FR BL+BR BC LFE 12: 3/2/2.1 FC FL+FR SiL+SiR BL+BR LFE Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '677c804aa3a78d61b21e6423165a252846c20f0e'Michael Niedermayer2015-06-081-0/+5
|\| | | | | | | | | | | | | | | * commit '677c804aa3a78d61b21e6423165a252846c20f0e': aac: correctly map 7.1ch-wide AAC from FDK AAC encoder Sample: FDK_7.1ch_wide.aac Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: correctly map 7.1ch-wide AAC from FDK AAC encodernu7742015-06-071-0/+5
| | | | | | | | | | | | | | | | | | | | FDK AAC encoder outputs SCE(front)+CPE(front)+CPE(back)+CPE(back) on MODE_7_1_REAR_SURROUND configuration. Since decoder couldn't properly map 4 back channels, decoding failed unless -request_channel_layout 0x8000000000000000 has been specified. Now we treat first CPE(back) as CPE(side) on channel mapping. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '252d6200c36e7eaa79f8d5205b7d731179e94897'Michael Niedermayer2015-06-082-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '252d6200c36e7eaa79f8d5205b7d731179e94897': avio: Add avio_put_str16be Conflicts: doc/APIchanges libavformat/avio.h libavformat/aviobuf.c libavformat/version.h The FFmpeg implementation is kept as requested by ubitux Doxy improvements merged Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: Add avio_put_str16beLuca Barbato2015-06-074-15/+36
| |
* | Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'Michael Niedermayer2015-06-085-2/+227
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '9b56ac74b170d12027fbc81f581a451a709f1105': mpjpeg: Initial implementation Conflicts: Changelog libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpjpeg: Initial implementationLuca Barbato2015-06-075-2/+227
| | | | | | | | | | | | Support only streams with Content-Length. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/hdsenc: Change duration from single to to double precisionMichael Niedermayer2015-06-081-1/+1
| | | | | | | | | | | | This slightly improves precision Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rmenc: Remove float usageMichael Niedermayer2015-06-071-8/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libstagefright: Check for pthread_create() failureMichael Niedermayer2015-06-071-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: fix a few 5 spaces indentClément Bœsch2015-06-074-22/+22
| |
* | avdevice/iec61883: Check pthread init for failuresMichael Niedermayer2015-06-071-3/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: Check for ffio_set_buf_size() failureMichael Niedermayer2015-06-071-2/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf: Check for ffio_set_buf_size() failureMichael Niedermayer2015-06-071-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/ffmdec: Check ffio_set_buf_size() return valueMichael Niedermayer2015-06-071-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: Check allocations (likely not all)Michael Niedermayer2015-06-071-0/+20
| | | | | | | | | | Reviewed-by: "Reynaldo H. Verdejo Pinochet" <reynaldo@osg.samsung.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: add missing avdevice dependency to closed caption testJames Almer2015-06-071-1/+1
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/allcodecs: Re-order nvenc encoders below x264/5.Philip Langdale2015-06-061-3/+3
| | | | | | | | | | | | We shouldn't pick nvenc by default. Signed-off-by: Philip Langdale <philipl@overt.org>
* | vf_colormatrix: calculate coefficients only onceGanesh Ajjanagadde2015-06-071-2/+2
| | | | | | | | | | | | | | calc_coefficients is no longer being called every frame Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Use av_memdup() for allocating thread_contextMichael Niedermayer2015-06-061-4/+8
| | | | | | | | | | | | Also check for allocation failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Clear thread_context array before allocatingMichael Niedermayer2015-06-061-0/+2
| | | | | | | | | | | | This is probably redundant but its safer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Merge thread context initialization loopsMichael Niedermayer2015-06-061-10/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/nvenc: Add 'nvenc_h264' as an alternative name for 'nvenc'Philip Langdale2015-06-063-0/+27
| | | | | | | | | | | | | | | | This allows us to offer the same codec name that libav uses. We don't have a special way to do aliases, so it's all a bit more verbose than you'd want but such is life. Signed-off-by: Philip Langdale <philipl@overt.org>
* | avcodec/nvenc: Rename nvenc_h265 to nvenc_hevcPhilip Langdale2015-06-064-12/+12
| | | | | | | | | | | | | | For the sake of compatibility, and because pretty much everything else in the codebase calls it HEVC. Signed-off-by: Philip Langdale <philipl@overt.org>
* | Revert "avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the ↵Philip Langdale2015-06-062-1/+1
| | | | | | | | | | | | | | | | other implementation" This reverts commit d0d0913702358c61dfb9c5ac8b141cd203524869. Signed-off-by: Philip Langdale <philipl@overt.org>
* | Revert "Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'"Philip Langdale2015-06-069-1512/+6
| | | | | | | | | | | | | | This reverts commit d8bbb99c51af08c76dd0a66588fecc5c0106844d, reversing changes made to d0d0913702358c61dfb9c5ac8b141cd203524869. Signed-off-by: Philip Langdale <philipl@overt.org>
* | Revert "nvenc: remove cuda.h requirement for nvenc_a"Philip Langdale2015-06-061-4/+3
| | | | | | | | | | | | This reverts commit f10497042f092d56f82f536276d5998d7fd1e4c4. Signed-off-by: Philip Langdale <philipl@overt.org>
* | Revert "avcodec/Makefile: fix checkheaders for nvenc_b"Philip Langdale2015-06-061-2/+0
| | | | | | | | | | | | This reverts commit 3be811a528461816063059377fcb2ac60eabfa77. Signed-off-by: Philip Langdale <philipl@overt.org>
* | Revert "Changelog: Drop duplicate NVENC entry"Philip Langdale2015-06-061-0/+1
| | | | | | | | | | | | This reverts commit 440fa7758b687bbb0007f85497eed8bb9aec96bd. Signed-off-by: Philip Langdale <philipl@overt.org>
* | avutil/colorspace: Remove RGB_TO_Y/U/VMichael Niedermayer2015-06-061-12/+0
| | | | | | | | | | | | | | | | They are unused and colorspace.h is not a installed header Found-by: Timo Rothenpieler <timo@rothenpieler.org> Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/exr: fix crash caused by mergePaul B Mahol2015-06-061-15/+16
| | | | | | | | | | | | | | | | Various header informations need to be reset when decoding next frame. Regression since: 95582b5c Fixes ticket #4597. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | configure: improve the checks for gmtime_r and localtime_rJames Almer2015-06-061-2/+2
| | | | | | | | | | | | | | | | They are inlined wrapper functions inside the time.h header on MinGW-w64, so neither check_func() or check_func_headers() work with them. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | Changelog: Drop duplicate NVENC entryMichael Niedermayer2015-06-061-1/+0
| | | | | | | | | | Found-by: Timo Rothenpieler <timo@rothenpieler.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/x11grab: use av_clip() instead of nested min & maxClément Bœsch2015-06-061-4/+4
| | | | | | | | | | Note: [xy]_off and screen_[wh] variables are int, as well as X11GrabContext.{width,height,x_off,y_off}.
* | avcodec/snowenc: use av_clip() instead of nested min & maxClément Bœsch2015-06-061-1/+1
| | | | | | | | Note: AVCodecContext.refs is an int field.
* | avcodec/mpegvideo: use av_clip() instead of nested min & maxClément Bœsch2015-06-061-1/+1
| | | | | | | | | | Note: MpegEncContext.mb_{y,height} are int fields, as well as local off variable.
* | ffplay: use av_clip() instead of nested min & maxClément Bœsch2015-06-061-1/+1
| | | | | | | | Note: {wanted,min,max}_samples are int variables.
* | hevc: fix typo (mpv -> mvp).Ronald S. Bultje2015-06-061-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2015-06-062-12/+87
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ. lavf/http: Indent else-clause. lavf/http: Properly process HTTP header on listen. lavf/http: Rudimentary error handling for HTTP requests received from clients. lavf/http: Process HTTP header before sending response. lavf/http: Document method option. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf/http: Add simple autodetection for client HTTP method, based on ↵Stephan Holljes2015-06-061-0/+9
| | | | | | | | | | | | | | | | | | AVIO_FLAG_READ. Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
| * | lavf/http: Indent else-clause.Stephan Holljes2015-06-061-9/+8
| | | | | | | | | | | | Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
| * | lavf/http: Properly process HTTP header on listen.Stephan Holljes2015-06-061-1/+40
| | | | | | | | | | | | Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>