summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08'Michael Niedermayer2014-03-26
|\ | | | | | | | | | | | | | | | | | | * commit 'e7373585f827d4ec05d952daa3877e8decfe3c08': dsputil_template: Move bits that are used templatized into separate file Conflicts: libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil_template: Move bits that are used templatized into separate fileDiego Biurrun2014-03-26
| | | | | | | | This allows detemplatizing the bits that are not instantiated twice.
* | Merge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f'Michael Niedermayer2014-03-26
|\| | | | | | | | | | | | | * commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f': dsputil: Move hpel_template #include out of dsputil_template Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move hpel_template #include out of dsputil_templateDiego Biurrun2014-03-26
| | | | | | | | Multiple inclusion makes no sense as it is only used in the 8-bit case.
* | Merge commit 'd0aabeab23755ee906440505ad2097c0f1493e80'Michael Niedermayer2014-03-26
|\| | | | | | | | | | | | | | | * commit 'd0aabeab23755ee906440505ad2097c0f1493e80': x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocation See: c8246d37664af9feb23edede944846687aea787a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocationDiego Biurrun2014-03-26
| | | | | | | | This fixes FATE with mmxext CPUFLAGS set.
* | avcodec/h261: move b_stride/b_xy under the if() where they are usedMichael Niedermayer2014-03-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc: Export picture typeMichael Niedermayer2014-03-26
| | | | | | | | | | | | | | | | | | This only uses the first slice, improvement here is welcome analyzing all slices the trivial way would interfere with threads Fixes Ticket3185 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h261dec: fix motion vector vissualizationMichael Niedermayer2014-03-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-25
|\| | | | | | | | | | | | | * qatar/master: avcodec: add missing includes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: add missing includesVittorio Giovara2014-03-25
| |
* | Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'Michael Niedermayer2014-03-25
|\| | | | | | | | | | | | | * commit 'aa499568afc01d59215eef7e5b14b949a9671afc': avconv: More descriptive message about framedrop Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: More descriptive message about framedropVittorio Giovara2014-03-25
| |
* | Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'Michael Niedermayer2014-03-25
|\| | | | | | | | | | | | | | | | | | | * commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3': vf_transpose: K&R formatting cosmetics Conflicts: libavfilter/vf_transpose.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vf_transpose: K&R formatting cosmeticsVittorio Giovara2014-03-25
| |
* | x86/cpu: check for OS support before enabling AVX2James Almer2014-03-25
| | | | | | | | | | | | | | AV_CPU_FLAG_AVX is enabled at this point only if there's OS support. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | udp: mention default in documentationrogerdpack2014-03-25
| | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dshow: log error and continue if unable to set audio bufferrogerdpack2014-03-25
| | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add an .oga muxer.Carl Eugen Hoyos2014-03-25
| |
* | Do not set swscale sizeFactor to -1.Carl Eugen Hoyos2014-03-25
| | | | | | | | Fixes ticket #3495.
* | swscale: add two spatially stable dithering methodsØyvind Kolås2014-03-25
| | | | | | | | | | | | | | | | | | | | | | | | | | Both of these dithering methods are from http://pippin.gimp.org/a_dither/ for GIF they can be considered better than bayer (provides more gray-levels), and spatial stability - often more than twice as good compression and less visual flicker than error diffusion methods (the methods also avoids error-shadow artifacts of diffusion dithers). These methods are similar to blue/green noise type dither masks; but are simple enough to generate their mask on the fly. They are still research work in progress; though more expensive to generate masks (which can be used in a LUT) like 'void and cluster' and similar methods will yield superior results
* | libavcodec/*/vp8dsp_init: indentPeter Ross2014-03-25
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/riff: add On2 VP7 fourccsPeter Ross2014-03-25
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | On2 VP7 decoderPeter Ross2014-03-25
| | | | | | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: BBB previous patch reviewed by jason Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vp8: vp8_find_free_bufferPeter Ross2014-03-25
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/svq1enc: fix undefined pointer operationMichael Niedermayer2014-03-25
| | | | | | | | | | | | | | | | Fixes Ticket3152 This also removes the dependance on ff_init_block_index/ff_update_block_index() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/mpegvideoenc_template: fix integer overflowMichael Niedermayer2014-03-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dox/scaler:fix bicubiclin typoMichael Niedermayer2014-03-24
| | | | | | | | | | | | See Ticket3486 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | * qatar/master: libx265: Only use one memcpy for headers See: ecb5b9c098009787e02f6de9e2d3e1786531c2f2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx265: Only use one memcpy for headersDerek Buitenhuis2014-03-24
| | | | | | | | | | | | They're guaranteed by the x265 API to be contiguous in memory. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | * commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed': libx265: Write global extradata when requested See: dded5ed9c5eb0c3d5a953e661ea21a9019e93ea4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx265: Write global extradata when requestedMichael Niedermayer2014-03-24
| | | | | | | | | | | | | | | | Matroska, MP4, and other containers require it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | | | * commit '8ef33497a6a3ed05d2f931809c074ef3d1878834': build: Add config option for CABAC code Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Add config option for CABAC codeDiego Biurrun2014-03-24
| | | | | | | | This allows for more elegant dependency and object declarations.
* | avcodec/h264: use ff_h264_set_erpic() instead of memsetMichael Niedermayer2014-03-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: move packet deallocation into write_frameMichael Niedermayer2014-03-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | * qatar/master: avconv: don't warn on multiple frames per packet for codecs that expect it Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: don't warn on multiple frames per packet for codecs that expect itAnton Khirnov2014-03-24
| |
* | Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | * commit '4754345027eb85cfa51aeb88beec68d7b036c11e': avconv: print verbose per-stream transcoding statistics Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: print verbose per-stream transcoding statisticsAnton Khirnov2014-03-24
| |
* | Merge commit 'a220b07b0f971f88213aef012aea51af2800be62'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | * commit 'a220b07b0f971f88213aef012aea51af2800be62': avconv: split printing the final statistics into a separate function Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: split printing the final statistics into a separate functionAnton Khirnov2014-03-24
| |
* | libx265: Only use one memcpy for headersDerek Buitenhuis2014-03-24
| | | | | | | | | | | | They're guaranteed by the x265 API to be contiguous in memory. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | libx265: Simple cosmetic fixDerek Buitenhuis2014-03-24
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | * commit 'baeb59d89beda499688e528c6a269d2b255b66f2': avconv: rewrite output data size tracking Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: rewrite output data size trackingAnton Khirnov2014-03-24
| | | | | | | | | | | | Store a variable per OutputStream instead of globals for audio/video/extradata. This makes the code simpler and cleaner and fixes 2pass with multiple output streams.
* | Merge commit 'f759f66e367bc62ed7738a51040f775b656a60d8'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | * commit 'f759f66e367bc62ed7738a51040f775b656a60d8': avconv: explicitly report when the muxing overhead is unknown Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: explicitly report when the muxing overhead is unknownAnton Khirnov2014-03-24
| |
* | Merge commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e'Michael Niedermayer2014-03-24
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '781d97fd54b1f0d8f4f7536dbd932dca6445476e': avconv: remove unused nb_frames_dup Conflicts: ffmpeg.c No change, as the variable is not unused Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: remove unused nb_frames_dupAnton Khirnov2014-03-24
| | | | | | | | Frame duplication now happens in vf_fps.