aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'Michael Niedermayer2014-06-261-42/+45
|\ | | | | | | | | | | | | | | | | | | * 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-261-26/+23
| |
* | Merge commit 'edd5f957646dcbf1bb55718bc7bf1e5481c25bcb'Michael Niedermayer2014-06-261-46/+40
|\| | | | | | | | | | | | | | | | | | | * 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-261-42/+39
| |
* | Merge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'Michael Niedermayer2014-06-261-69/+47
|\| | | | | | | | | | | | | | | | | | | * 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-261-19/+24
| |
* | Merge commit 'ac85f631c9a9cc59aaca1c8dd6894fb1f701c594'Michael Niedermayer2014-06-261-0/+2
|\| | | | | | | | | | | | | | | | | | | * 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-261-0/+2
| |
* | Merge commit '294daf71a7a1303b5ddd3cbefebed3b732d610f3'Michael Niedermayer2014-06-261-45/+58
|\| | | | | | | | | | | | | | | | | | | * 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-261-43/+50
| |
* | Merge commit '38d044429dabcd28928693240e955c6d4430cca9'Michael Niedermayer2014-06-261-33/+49
|\| | | | | | | | | | | | | | | | | | | * 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-261-16/+23
| |
* | Merge commit '3f4edf012593c73941caa0ef9b292da00225c3df'Michael Niedermayer2014-06-261-5/+1
|\| | | | | | | | | | | | | | | * 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-261-2/+1
| | | | | | | | | | | | 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-261-22/+1
|\| | | | | | | | | | | | | | | | | | | * 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-261-21/+1
| |
* | avcodec/snow: ensure the buffers have allocated edgesMichael Niedermayer2014-06-262-2/+21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a0e1c3517a656dd32293f054a339e0ac73328138'Michael Niedermayer2014-06-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * 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-262-19/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '9b60d9197970658e91daf4b586397f450de9af69'Michael Niedermayer2014-06-261-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-261-5/+10
| | | | | | | | | | | | 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-262-29/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-262-6/+28
| | | | | | | | | | | | | | | | | | 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-261-1/+1
|\| | | | | | | | | | | | | | | | | | | * 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-251-1/+1
| |
* | Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5'Michael Niedermayer2014-06-261-1/+1
|\| | | | | | | | | | | | | * commit '5ab03e41e553452118113d0c224fa32b325e45e5': x86: h264dsp: Fix link failure with optimizations disabled Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264dsp: Fix link failure with optimizations disabledDiego Biurrun2014-06-251-1/+1
| | | | | | | | | | | | | | | | With optimzations disabled compilers have trouble doing dead code elimination on 'if (foo && 0)' expressions, while 'if (0 && foo)' still works, so use the latter to avoid problems. Bug-Id: 707
* | avformat/mxfenc: set/force channelcount in MXF D-10Gaullier Nicolas2014-06-261-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are interoperability issues with D-10 related to the channelcount property in the generic sound essence descriptor. On one side, SMPTE 386M requires channel count to be 4 or 8, other values being prohibited. The most widespread value is 8, which seems straightforward as it is the actual size of the allocated structure/disk space. At the end, it appears that some vendors or workflows do require this descriptor to be 8, and otherwise just "fail". On the other side, at least AVID and ffmpeg do write/set the channel count to the exact number of channels really "used", usually 2 or 4, or any other value. And on the decoding side, ffmpeg (for example) make use of the channel count for probing and only expose this limited number of audio streams (which make sense but has strong impact on ffmpeg command line usage, output, and downstream workflow). At the end, I find it pretty usefull to simply give ffmpeg the ability to force/set the channel count to any value the user wants. (there are turnaround using complex filters, pans, amerge etc., but it is quite boring and requires the command line to be adapted to the input file properties) Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/x86/vf_pullup: fix old typoMichael Niedermayer2014-06-251-1/+1
| | | | | | | | | | | | | | This makes C and MMX match, no change to fate as the differences where apparently not sufficient to show up in fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_pullup: use ptrdiff_t as stride argument for dsp functionsMichael Niedermayer2014-06-253-10/+10
| | | | | | | | | | | | This should avoid issues on x86_64 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/hevc_idct: fix function name in commentMichael Niedermayer2014-06-251-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/hevc_idct: fix number of sse registersplepere2014-06-251-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/hevc: add avx2 dc idctplepere2014-06-253-3/+72
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/build_system: document examples and config targetsLukasz Marek2014-06-251-0/+6
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2014-06-241-49/+45
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: decrease audio_diff_threshold ffplay: decrease max audio callbacks per second ffplay: calculate SDL audio buffer size based on sample rate ffplay: pass simple integers to calculate_display_rect and set_default_window_size ffplay: eliminate pictq_prev_picture Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: decrease audio_diff_thresholdMarton Balint2014-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since audio clock calculations are more accurate now, it is safe to decrease the sync treshold to compensate the larger buffers caused by less frequent audio callbacks. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: decrease max audio callbacks per secondMarton Balint2014-06-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Too many audio callbacks per second can cause buffer underruns especially under load. As now we take into accound the elapsed time after an audio callback when determining current audio clock, it is not that important to use small buffer sizes and frequent audio callbacks, so lets remove the comment. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: calculate SDL audio buffer size based on sample rateMarton Balint2014-06-241-4/+6
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: pass simple integers to calculate_display_rect and ↵Marton Balint2014-06-241-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | set_default_window_size No change in functionality. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: eliminate pictq_prev_pictureMarton Balint2014-06-241-29/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of directly rolling back the frame queue, keep the last displayed picture in the queue and use a boolean variable to keep track if it is displayed or not. This makes the code cleaner because it removes the complicated logic in pictq_prev_picture. There should be no change in functionality. Signed-off-by: Marton Balint <cus@passwd.hu>
* | | Merge commit '2deb614272e6faad8802c5341971d08c7272f74d'Michael Niedermayer2014-06-240-0/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | | | * commit '2deb614272e6faad8802c5341971d08c7272f74d': mjpegdec: Properly set the context colorspace info See: c11043aca7365add6c4c80b7cff80d22dde0eb94 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegdec: Properly set the context colorspace infoDerek Buitenhuis2014-06-241-0/+1
| | | | | | | | | | | | The JPEG spec requires it to be this. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avfilter/vf_deshake: fix macro ()Michael Niedermayer2014-06-241-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_colormatrix: fix macro ()Michael Niedermayer2014-06-241-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: Properly set the context colorspace infoDerek Buitenhuis2014-06-241-0/+1
| | | | | | | | | | | | The JPEG spec requires it to be this. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avformat/nutdec: improve probe speed by 30%Michael Niedermayer2014-06-241-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wavenc: simplify malloc failure checkingMichael Niedermayer2014-06-241-6/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wavenc: more specific error return for "Writing 16 bit peak for 8 ↵Michael Niedermayer2014-06-241-1/+1
| | | | | | | | | | | | bit audio" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wavenc: do not hardcode array size in memset and other functionsMichael Niedermayer2014-06-241-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wavenc: use the bitexact flag from avformat instead of the one from ↵Michael Niedermayer2014-06-241-1/+1
| | | | | | | | | | | | avcodec Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 04:11:05 +0000