summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | | | | | | | * commit 'e63b818dbe6060b606ae10eb184859f8b97d2353': dv: Properly split decoder and encoder initialization Conflicts: libavcodec/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Properly split decoder and encoder initializationDiego Biurrun2014-06-27
| |
* | ffmpeg: fix deadlock regression in threading error handingSergey2014-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dvbsubdec: fix ignoring blank frame by updating got_outputAnshul Maheshwari2014-06-27
| | | | | | | | | | | | fix ticket 3737 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: add missing audiodsp dependency for ra144James Almer2014-06-27
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: fix g729 decoder dependenciesJames Almer2014-06-27
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: remove duplicate ape_decoder_select lineJames Almer2014-06-27
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/snow: factor ff_snow_get_buffer() outMichael Niedermayer2014-06-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfenc: rename very recently added option to set/force channelcount ↵Gaullier Nicolas2014-06-27
| | | | | | | | | | | | | | | | in MXF D-10 Approved-by: Tomas Härdin <tomas.hardin@codemill.se> Approved-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | * commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133': dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectory Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectoryDiego Biurrun2014-06-26
| |
* | Merge commit '24f45c16224d4c5d482e928676714766ffdda4fc'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | | | | | | | | | * commit '24f45c16224d4c5d482e928676714766ffdda4fc': fate: Add dependencies for dct/fft/mdct/rdft tests Conflicts: libavcodec/fft-test.c tests/fate/fft.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Add dependencies for dct/fft/mdct/rdft testsDiego Biurrun2014-06-26
| |
* | Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | | | | | | | * commit '5ec6d152e26c570c0a16ec72c1f354db95708179': indeo4: B-frames decoding Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo4: B-frames decodingDirk Ausserhaus2014-06-26
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | Merge commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | * commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6': indeo2: rename stride to pitch for consistency with other Indeo decoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo2: rename stride to pitch for consistency with other Indeo decodersKostya Shishkov2014-06-26
| |
* | Merge commit 'a5864e9a253143437471dba61a533e7fa9acec1c'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | | | * commit 'a5864e9a253143437471dba61a533e7fa9acec1c': output example: free the muxing format context properly See: 9b211c43dc5f2e618f204c4a7fd184eb2ea51f02 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output example: free the muxing format context properlyAnton Khirnov2014-06-26
| |
* | Merge commit '182d3f8221c23716ea4eafa460bdb94968f71f26'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | | | | | | | * commit '182d3f8221c23716ea4eafa460bdb94968f71f26': output example: rewrite encoding logic Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output example: rewrite encoding logicAnton Khirnov2014-06-26
| | | | | | | | | | Properly generate pts for the frames sent to the encoder, avoid using private and deprecated AVStream.pts.
* | Merge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11'Michael Niedermayer2014-06-27
|\| | | | | | | | | | | | | | | | | | | * commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11': output example: store the scaling context in the stream context Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output example: store the scaling context in the stream contextAnton Khirnov2014-06-26
| |
* | Merge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | * commit '6a927d7aaf5625e83a674072913b9e292a303fd1': output example: use a macro instead of a static variable Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output example: use a macro instead of a static variableAnton Khirnov2014-06-26
| |
* | Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | * commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb': output example: allocate the audio frame only once Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output example: allocate the audio frame only onceAnton Khirnov2014-06-26
| |
* | Merge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | * commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb': output example: use OutputStream for audio streams as well Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output example: use OutputStream for audio streams as wellAnton Khirnov2014-06-26
| |
* | Merge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | * commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38': output example: use the new AVFrame API to allocate audio frames Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output example: use the new AVFrame API to allocate audio framesAnton Khirnov2014-06-26
| |
* | Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | * commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594': output example: set output channel layout Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output example: set output channel layoutAnton Khirnov2014-06-26
| |
* | Merge commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | * commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3': output example: use a struct to bundle the video stream variables together Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output example: use a struct to bundle the video stream variables togetherAnton Khirnov2014-06-26
| |
* | Merge commit '38d044429dabcd28928693240e955c6d4430cca9'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | * commit '38d044429dabcd28928693240e955c6d4430cca9': output example: use the new AVFrame API for allocating the video frame Conflicts: doc/examples/muxing.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * output example: use the new AVFrame API for allocating the video frameAnton Khirnov2014-06-26
| |
* | Merge commit '3f4edf012593c73941caa0ef9b292da00225c3df'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | * commit '3f4edf012593c73941caa0ef9b292da00225c3df': dump_stream: print the timebase as is, do not reduce it See: 75511c293add07db1cca58dcd8b08c33fc2f1075 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump_stream: print the timebase as is, do not reduce itAnton Khirnov2014-06-26
| | | | | | | | | | | | It makes more sense to print the timebase exactly as it is set. Also, this avoids a divide by zero when av_dump_format() is called on a format context before writing the header.
* | Merge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | * commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443': lavc: do not allocate edges in the default get_buffer2() Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: do not allocate edges in the default get_buffer2()Anton Khirnov2014-06-26
| |
* | avcodec/snow: ensure the buffers have allocated edgesMichael Niedermayer2014-06-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a0e1c3517a656dd32293f054a339e0ac73328138'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a0e1c3517a656dd32293f054a339e0ac73328138': hevc: remove unused array min_cb_addr_zs Conflicts: libavcodec/hevc_ps.c See: f7f1f4c7ce9ce689823e13a53b694eb14cbbf6e7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: remove unused array min_cb_addr_zsGildas Cocherel2014-06-26
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '9b60d9197970658e91daf4b586397f450de9af69'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '9b60d9197970658e91daf4b586397f450de9af69': hevc: Allow out of bound values for num_reorder_pics Conflicts: libavcodec/hevc_ps.c See: bc21260e643c2249e38f7485bceada1d4bbb2b9a See: ab296c7a9fe590860dc95ba97e9cbb9dde798f20 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: Allow out of bound values for num_reorder_picsKieran Kunhya2014-06-26
| | | | | | | | | | | | This fixes decoding for a sample that cannot be shared Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | x86/videodsp: add emulated_edge_mc_mmxextJames Almer2014-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This also changes hfix8_mmx and above to use mmx regs instead of gprs, and makes emulated_edge_mc_sse and emulated_edge_mc_sse2 use mmxext hfix and hvar functions instead of mmx where possible. This is mostly in preparation for an ssse3 version. Signed-off-by: James Almer <jamrial@gmail.com> code is about 1 cpu cycle faster approximately Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cavs: fix B_SUB_DIRECT col-MB is Intra MB case.Yao Wang2014-06-26
| | | | | | | | | | | | | | | | | | in this case current MB size is forced to 16x16 (AVS standard section 9.9.1) Signed-off-by: Yao Wang <jiayaowang@gmail.com> Fixes Ticket 1901 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '593d2326ef985cdffe413df629419938f7b07c4c'Michael Niedermayer2014-06-26
|\| | | | | | | | | | | | | | | | | | | * commit '593d2326ef985cdffe413df629419938f7b07c4c': dv: Replace a magic number by sizeof() Conflicts: libavcodec/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv: Replace a magic number by sizeof()Diego Biurrun2014-06-25
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 08:01:48 +0000