summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | doc/examples/resampling_audio: use av_freep() for safteyMichael Niedermayer2014-06-291-1/+1
| | | | | | | | | | | | also its better in examples to use the safer functions. Signed-off-by: Michael Niedermayer <[email protected]>
* | avfilter/overlay: reindentClément Bœsch2014-06-291-15/+14
| |
* | avfilter/buffersrc: reindentClément Bœsch2014-06-291-7/+7
| |
* | ffmpeg_opt: route -ab to -b:aMichael Niedermayer2014-06-291-1/+7
| | | | | | | | | | | | | | Fixes combining -ab with -target pal-dvd Fixes Ticket3736 Signed-off-by: Michael Niedermayer <[email protected]>
* | avfilter/vf_pullup: workaround bug in gcc 4.4.3 on ARMMichael Niedermayer2014-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | The gcc version affected is very old and unmaintained AFAIK thus i made no attempt to report this to the gcc developers. The workaround is pushed as it may still affect users and does affect one fate client Signed-off-by: Michael Niedermayer <[email protected]>
* | doc/examples/muxing: remove unused variableMichael Niedermayer2014-06-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '7b0c7c9163fe3dd0081696befde28617119d2590'Michael Niedermayer2014-06-281-1/+3
|\| | | | | | | | | | | | | * commit '7b0c7c9163fe3dd0081696befde28617119d2590': arm: Detect 32 bit cpu features on ARMv8 when running on a 64 bit kernel Merged-by: Michael Niedermayer <[email protected]>
| * arm: Detect 32 bit cpu features on ARMv8 when running on a 64 bit kernelMartin Storsjö2014-06-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running on a 64 bit kernel, /proc/cpuinfo lists different optional features than on 32 bit kernels (because some of them are mandatory in the 64 bit implemenations). The kernel does list the old features properly if they are queried via /proc/self/auxv though - however this file is not always readable (e.g. on most android systems). The getauxval function could also provide the same info as /proc/self/auxv even if this file isn't readable, but this function is not always available (and thus would need to be loaded with dlsym for compatibility with older android versions). The android cpufeatures library does this slightly differently, by assuming that these are available if the "CPU architecture" line is >= 8, see [1] for details. It has been suggested to include the old, non-optional features in /proc/cpuinfo as well, but that suggested patch never was merged. See [2] for the discussion around this suggestion. [1] https://android-review.googlesource.com/91380 [2] http://marc.info/?l=linux-arm-kernel&m=139087240101974 Signed-off-by: Martin Storsjö <[email protected]>
* | avformat/options_table: Fix flush_packet flag flagsMichael Niedermayer2014-06-281-1/+1
| | | | | | | | | | Found-by: Reimar Döffinger <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mux: fix flush_packets flag with flushing buffersMichael Niedermayer2014-06-281-1/+1
| | | | | | | | | | Found-by: Reimar Döffinger <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/cavs: improve conformance with rm52j reference decoderYao Wang2014-06-282-179/+189
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/cavs: make cavs_chroma_qp non staticMichael Niedermayer2014-06-283-9/+10
| | | | | | | | | | | | | | | | The table is needed by multiple files Reverts part of ef07ac1e126b95ad7e1b56504c19b59901265c3e Signed-off-by: Michael Niedermayer <[email protected]>
* | swr: rewrite resample_common/linear_float_sse/avx in yasm.Ronald S. Bultje2014-06-286-149/+481
| | | | | | | | | | | | | | | | | | | | | | Linear interpolation goes from 63 (llvm) or 58 (gcc) to 48 (yasm) cycles/sample on 64bit, or from 66 (llvm/gcc) to 52 (yasm) cycles/ sample on 32bit. Bon-linear goes from 43 (llvm) or 38 (gcc) to 32 (yasm) cycles/sample on 64bit, or from 46 (llvm) or 44 (gcc) to 38 (yasm) cycles/sample on 32bit (all testing on OSX 10.9.2, llvm 5.1 and gcc 4.8/9). Signed-off-by: Michael Niedermayer <[email protected]>
* | avfilter/x86/vf_pullup: fix "invalid combination of opcode and operands" ↵Michael Niedermayer2014-06-281-3/+3
| | | | | | | | | | | | with nasm Signed-off-by: Michael Niedermayer <[email protected]>
* | swr: move dst_size == 0 handling outside DSP function.Ronald S. Bultje2014-06-281-3/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | doc/APIchanges: lengthening a hash to make it non ambigousMichael Niedermayer2014-06-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | APIchanges: fillin some missing dataMichael Niedermayer2014-06-281-22/+22
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '39975acc699c83af0a87a7318c0f41e189142938'Michael Niedermayer2014-06-281-4/+8
|\| | | | | | | | | | | | | * commit '39975acc699c83af0a87a7318c0f41e189142938': rtpenc_jpeg: check for color_range too Merged-by: Michael Niedermayer <[email protected]>
| * rtpenc_jpeg: check for color_range tooVittorio Giovara2014-06-281-4/+8
| |
* | Merge commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12'Michael Niedermayer2014-06-281-0/+7
|\| | | | | | | | | | | | | | | | | | | * commit 'f134b5ec53b4cb51cb69bf0c64de87687ea72b12': apichanges: fill in changes for lavu 51.19 and 51.20 Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <[email protected]>
| * apichanges: fill in changes for lavu 51.19 and 51.20Vittorio Giovara2014-06-281-0/+7
| |
* | avcodec/mpegvideo: dont overwrite emu_edge bufferMichael Niedermayer2014-06-282-2/+3
| | | | | | | | | | | | Fixes vsynth3 fate failures on mips Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/mpegvideo_enc: reduce space between blocks in emu_edge in ↵Michael Niedermayer2014-06-281-4/+4
| | | | | | | | encode_mb_internal
* | Revert "x86/videodsp: add emulated_edge_mc_mmxext"Michael Niedermayer2014-06-282-74/+29
| | | | | | | | | | | | | | | | | | | | The commit causes minor out of array reads and was mainly intended for future optimizations which turned out not to be meassurably faster. Itself it was just 1 cpu cycle faster Approved-by: jamrial This reverts commit 057d2704e78b52fec357b4fc646c9de37a085413.
* | avcodec/mpeg12dec: Limit progressive_seq reinitilaization to where the ↵Michael Niedermayer2014-06-281-1/+1
| | | | | | | | | | | | | | | | resolution changes Fixes Ticket3743 Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/vp8: Fix multiple ff_thread_finish_setup() callsMichael Niedermayer2014-06-271-1/+2
| | | | | | | | | | | | Fixes Ticket3725 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28'Michael Niedermayer2014-06-273-10/+11
|\| | | | | | | | | | | | | | | | | | | * commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28': mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter Conflicts: libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <[email protected]>
| * mpeg: Change ff_convert_matrix() to take an MpegEncContext parameterDiego Biurrun2014-06-273-7/+8
| | | | | | | | This will come in handy during dsputil splitting.
* | Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'Michael Niedermayer2014-06-273-26/+39
|\| | | | | | | | | | | | | | | | | | | * commit 'e63b818dbe6060b606ae10eb184859f8b97d2353': dv: Properly split decoder and encoder initialization Conflicts: libavcodec/dv.c Merged-by: Michael Niedermayer <[email protected]>
| * dv: Properly split decoder and encoder initializationDiego Biurrun2014-06-273-19/+31
| |
* | ffmpeg: fix deadlock regression in threading error handingSergey2014-06-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit fc9c857c introduced deadlock regression when processing too many inputs: ffmpeg $(seq -f " -f lavfi -i aevalsrc=0:d=%.0f" 70) -vf concat=n=70:v=0:a=1 -f null - Happens for different number of inputs, depending on available memory size, overcommit settings, ulimits, etc. Easily noticeable for 32-bit builds, that exhaust address space allocating 8-10 MB stack for each thread. Earlier ffmpeg versions exited with unhelpful "Conversion failed!" message. This patch fixes both problems: it frees the queue to prevent deadlock and adds a meaningful error message if pthread_create() fails. Reviewed-by: Nicolas George <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/dvbsubdec: fix ignoring blank frame by updating got_outputAnshul Maheshwari2014-06-271-8/+7
| | | | | | | | | | | | fix ticket 3737 Signed-off-by: Michael Niedermayer <[email protected]>
* | configure: add missing audiodsp dependency for ra144James Almer2014-06-271-1/+2
| | | | | | | | | | Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | configure: fix g729 decoder dependenciesJames Almer2014-06-271-1/+1
| | | | | | | | | | Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | configure: remove duplicate ape_decoder_select lineJames Almer2014-06-271-1/+0
| | | | | | | | | | Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/snow: factor ff_snow_get_buffer() outMichael Niedermayer2014-06-273-22/+24
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mxfenc: rename very recently added option to set/force channelcount ↵Gaullier Nicolas2014-06-271-5/+5
| | | | | | | | | | | | | | | | in MXF D-10 Approved-by: Tomas Härdin <[email protected]> Approved-by: tim nicholson <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133'Michael Niedermayer2014-06-273-22/+40
|\| | | | | | | | | | | | | * commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133': dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectory Merged-by: Michael Niedermayer <[email protected]>
| * dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectoryDiego Biurrun2014-06-263-22/+40
| |
* | Merge commit '24f45c16224d4c5d482e928676714766ffdda4fc'Michael Niedermayer2014-06-272-18/+36
|\| | | | | | | | | | | | | | | | | | | | | * commit '24f45c16224d4c5d482e928676714766ffdda4fc': fate: Add dependencies for dct/fft/mdct/rdft tests Conflicts: libavcodec/fft-test.c tests/fate/fft.mak Merged-by: Michael Niedermayer <[email protected]>
| * fate: Add dependencies for dct/fft/mdct/rdft testsDiego Biurrun2014-06-262-16/+38
| |
* | Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'Michael Niedermayer2014-06-276-56/+236
|\| | | | | | | | | | | | | | | | | | | * commit '5ec6d152e26c570c0a16ec72c1f354db95708179': indeo4: B-frames decoding Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <[email protected]>
| * indeo4: B-frames decodingDirk Ausserhaus2014-06-266-58/+238
| | | | | | | | Signed-off-by: Kostya Shishkov <[email protected]>
* | Merge commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6'Michael Niedermayer2014-06-271-8/+8
|\| | | | | | | | | | | | | * commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6': indeo2: rename stride to pitch for consistency with other Indeo decoders Merged-by: Michael Niedermayer <[email protected]>
| * indeo2: rename stride to pitch for consistency with other Indeo decodersKostya Shishkov2014-06-261-8/+8
| |
* | Merge commit 'a5864e9a253143437471dba61a533e7fa9acec1c'Michael Niedermayer2014-06-270-0/+0
|\| | | | | | | | | | | | | | | * commit 'a5864e9a253143437471dba61a533e7fa9acec1c': output example: free the muxing format context properly See: 9b211c43dc5f2e618f204c4a7fd184eb2ea51f02 Merged-by: Michael Niedermayer <[email protected]>
| * output example: free the muxing format context properlyAnton Khirnov2014-06-261-7/+1
| |
* | Merge commit '182d3f8221c23716ea4eafa460bdb94968f71f26'Michael Niedermayer2014-06-271-80/+108
|\| | | | | | | | | | | | | | | | | | | * commit '182d3f8221c23716ea4eafa460bdb94968f71f26': output example: rewrite encoding logic Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <[email protected]>
| * output example: rewrite encoding logicAnton Khirnov2014-06-261-77/+106
| | | | | | | | | | Properly generate pts for the frames sent to the encoder, avoid using private and deprecated AVStream.pts.
* | Merge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11'Michael Niedermayer2014-06-271-7/+10
|\| | | | | | | | | | | | | | | | | | | * commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11': output example: store the scaling context in the stream context Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <[email protected]>