summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'Michael Niedermayer2014-04-1933-40/+40
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '58400ac133bcfb6bf8196b4e5208bc178307739b': lavfi: name anonymous structs Conflicts: libavfilter/buffersink.c libavfilter/f_select.c libavfilter/src_movie.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_overlay.c libavfilter/vf_showinfo.c libavfilter/vf_unsharp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: name anonymous structsVittorio Giovara2014-04-1934-40/+40
| |
* | vp9/x86: simplify FILTER_INIT.Clément Bœsch2014-04-191-6/+2
| | | | | | | | | | | | | | In the 2 FILTER_INIT usages, the source is already preloaded so that extra complexity taken from FILTER_UPDATE is not necessary. Also add forgotten "mask" argument in FILTER_{INIT,UPDATE} comments.
* | vp9/x86: clarify mixed splatb.Clément Bœsch2014-04-191-5/+6
| |
* | x86/float_dsp: remove duplicated code from vector_dmul_scalarJames Almer2014-04-191-8/+3
| | | | | | | | | | | | | | | | Use the xm# and ym# aliases as they remain in sync with m# after a SWAP. No actual changes to the assembly. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-04-1912-51/+80
|\ \ | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Fix compilation with !HAVE_6REGS. Use MANGLE in cavsdsp.c to save two registers using gcc. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Fix compilation with !HAVE_6REGS.Carl Eugen Hoyos2014-04-1911-19/+47
| | | | | | | | | | | | | | | Can be tested with: $ ./configure --cc='cc -m32' --disable-optimizations --enable-pic
| * | Use MANGLE in cavsdsp.c to save two registers using gcc.Carl Eugen Hoyos2014-04-191-32/+33
| | | | | | | | | | | | Fixes compilation with !HAVE_6REGS.
* | | Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974'Michael Niedermayer2014-04-191-2/+4
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | * commit '4936ef6492f640e1606c6507f2c4e495164d3974': configure: Handle armcc 5.0 Conflicts: configure See: db55365d0f938ee93ed660a14c07f10f2a66dd10 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Handle armcc 5.0Martin Storsjö2014-04-191-2/+4
| | | | | | | | | | | | | | The first line of the "armcc --vsn" output in one version is "Product: ARM Compiler 5.04". Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mlv: add fate samplePeter Ross2014-04-192-0/+4
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Magic Lantern Video (MLV) demuxerPeter Ross2014-04-195-0/+462
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_id3v2_read: add option to limit ID3 magic number searchPeter Ross2014-04-197-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 ' chunk tag. If such chunks are stored sequentially, it is possible for the ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g. [1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] [2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULLPeter Ross2014-04-191-0/+2
| | | | | | | | | | | | | | Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wavdec: enlarge probe_packets for wavcsheng2014-04-191-1/+1
| | | | | | | | | | | | fix issue https://trac.ffmpeg.org/ticket/3550 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: add DTS-ES testJames Almer2014-04-191-0/+5
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_rotate: make int*90° rotates suck less speedwiseMichael Niedermayer2014-04-191-0/+77
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_rotate: fix several of by 1 errorsMichael Niedermayer2014-04-192-25/+25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_rotate: fix location of update operationMichael Niedermayer2014-04-192-22/+22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_rotate: increase fixed point precisionMichael Niedermayer2014-04-192-28/+29
| | | | | | | | | | | | This ensures int_sins output doesnt have "random" lsbs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix standalone compilation of image2_alias_pix and image2_brender_pix demuxers.Carl Eugen Hoyos2014-04-191-0/+2
| |
* | avcodec/qtrleenc: use av_mallocz_array()Michael Niedermayer2014-04-181-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/smacker: use av_mallocz_array()Michael Niedermayer2014-04-181-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/roqvideoenc: use av_malloc(z)_array()Michael Niedermayer2014-04-181-10/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpeg: cosmetics: indentationJustin Ruggles2014-04-181-7/+7
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | mjpeg: Do not fail jpeg decoding on bad EXIF data.Justin Ruggles2014-04-181-4/+2
| | | | | | | | | | | | It is not required to correctly decode the image. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | configure: Remove deprecated incompatible_fork_abi optionJames Almer2014-04-181-7/+0
| | | | | | | | | | | | | | | | It's been deprecated since ffmpeg 2.0 Signed-off-by: James Almer <jamrial@gmail.com> Analysis of the usage of the switches by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/snow: use av_malloc(z)_array()Michael Niedermayer2014-04-181-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tta: use av_malloc(z)_array()Michael Niedermayer2014-04-181-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vc1dec: use av_realloc_array()Michael Niedermayer2014-04-181-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/dsddec: create audio stream before processing id3Peter Ross2014-04-181-4/+5
| | | | | | | | | | | | | | | | This ensures stream[0] is always the audio stream (an assumption made in dsf_read_packet). Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not overwrite VDPAU structures in ff_MPV_frame_start().Carl Eugen Hoyos2014-04-181-1/+1
| | | | | | | | Fixes crashes with VDR and MPlayer as reported by irc user crow.
* | Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer2014-04-184-101/+755
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lukaszmluki/master: lavd/pulse_audio_enc: implement pause messages lavd/pulse_audio_enc: implement volume messages lavd/avdevice: add volume messages lavd/pulse_audio_enc: add buffer fullness messages lavd/pulse_audio_enc: add nonblocking mode lavd/pulse_audio_enc: replace simple API with async API lavd/pulse_audio_enc: cosmetics lavd/pulse_audio_common: add context helper functions lavd/pulse_audio_common: rename variables and enums Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavd/pulse_audio_enc: implement pause messagesLukasz Marek2014-04-181-0/+14
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| * | lavd/pulse_audio_enc: implement volume messagesLukasz Marek2014-04-181-0/+246
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| * | lavd/avdevice: add volume messagesLukasz Marek2014-04-181-0/+53
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| * | lavd/pulse_audio_enc: add buffer fullness messagesLukasz Marek2014-04-181-0/+18
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| * | lavd/pulse_audio_enc: add nonblocking modeLukasz Marek2014-04-181-2/+9
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| * | lavd/pulse_audio_enc: replace simple API with async APILukasz Marek2014-04-181-36/+311
| | | | | | | | | | | | | | | | | | Async API allows to use full capabilites of PulseAudio. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| * | lavd/pulse_audio_enc: cosmeticsLukasz Marek2014-04-181-32/+35
| | |
| * | lavd/pulse_audio_common: add context helper functionsLukasz Marek2014-04-182-28/+66
| | | | | | | | | | | | | | | | | | | | | Functions allow to connect and disconnect from server. Helpfull to implement utility functions with nested loops. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
| * | lavd/pulse_audio_common: rename variables and enumsLukasz Marek2014-04-181-10/+10
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | | DSD Stream File (DSF) demuxerPeter Ross2014-04-184-0/+161
| | | | | | | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/replaygain: fix mixed declaration and statementMichael Niedermayer2014-04-181-1/+2
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix mixed merged & split side data with the stream->packet hackMichael Niedermayer2014-04-181-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821'Michael Niedermayer2014-04-183-25/+112
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '32d05934abc7427bb90380a4c1ab20a15fd7d821': mp3dec: decode more data from Info header Conflicts: libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3dec: decode more data from Info headerAlessandro Ghedini2014-04-173-10/+101
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63'Michael Niedermayer2014-04-175-3/+45
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '0983d48111f578e17e8c1967d25ce593fce62b63': crc: add ANSI CRC16 LE Conflicts: doc/APIchanges libavutil/crc.c libavutil/crc.h libavutil/version.h tests/ref/fate/crc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * crc: add ANSI CRC16 LEAlessandro Ghedini2014-04-175-3/+45
| | | | | | | | | | | | This adds the reversed byte-order version of the ANSI CRC16. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'fbd8e042107ec63e0ddf155588c59dcb76007641'Michael Niedermayer2014-04-171-44/+61
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'fbd8e042107ec63e0ddf155588c59dcb76007641': mp3dec: move XING/Info and VBRI parsing into their own functions Conflicts: libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud