summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '47e547b321338c73c21fa623789f1efbd80a297a'Clément Bœsch2017-04-17
|\ | | | | | | | | | | | | * commit '47e547b321338c73c21fa623789f1efbd80a297a': lavc: add a null bitstream filter Merged-by: Clément Bœsch <u@pkh.me>
| * lavc: add a null bitstream filterAnton Khirnov2016-12-14
| | | | | | | | | | | | It is useful for testing/debugging and will also be used as the default filter in the following commit adding pre-decode filtering to avoid having a separate non-filtered codepath.
* | Merge commit '0309ddcfb25fd44883bfcdb07509eb4907576b97'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit '0309ddcfb25fd44883bfcdb07509eb4907576b97': lavc: handle MP3 in get_audio_frame_duration() Merged-by: Clément Bœsch <u@pkh.me>
| * lavc: handle MP3 in get_audio_frame_duration()Anton Khirnov2016-12-14
| |
* | Merge commit '6aa4ba7131b6e8668e33430e18101a051fe492eb'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit '6aa4ba7131b6e8668e33430e18101a051fe492eb': dxva2: Keep code shared between dxva2 and d3d11va under the correct #if Merged-by: Clément Bœsch <u@pkh.me>
| * dxva2: Keep code shared between dxva2 and d3d11va under the correct #ifDiego Biurrun2016-12-12
| | | | | | | | This partially reverts commit ac648bb835edd3f67bda2267d0e72e5e582eb5a1.
* | Merge commit 'b0e6b3f4777910d61083976aa9fc78a1e0731aae'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit 'b0e6b3f4777910d61083976aa9fc78a1e0731aae': hevc: ppc: Add HEVC 4x4 IDCT for PowerPC Merged-by: Clément Bœsch <u@pkh.me>
| * hevc: ppc: Add HEVC 4x4 IDCT for PowerPCAlexandra Hajkova2016-12-12
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'fc368497f2fff54ddf5316224c573c9d1939fb25'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit 'fc368497f2fff54ddf5316224c573c9d1939fb25': configure: Add missing dxva2 dependency for dxva2_lib Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Add missing dxva2 dependency for dxva2_libDiego Biurrun2016-12-12
| |
* | Merge commit 'f1248fae90b45501af4e8743d373e79191470331'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit 'f1248fae90b45501af4e8743d373e79191470331': configure: Handle dxva2 optional components in the standard way Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Handle dxva2 optional components in the standard wayDiego Biurrun2016-12-11
| |
* | Merge commit 'a6901b9c6bd51396c1159f1a07f9f5042328cda6'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | | | | | * commit 'a6901b9c6bd51396c1159f1a07f9f5042328cda6': Drop libxvid rate control support for mpegvideo encoding This commit is a noop, there is no known issue with it. Merged-by: Clément Bœsch <u@pkh.me>
| * Drop libxvid rate control support for mpegvideo encodingDiego Biurrun2016-12-11
| | | | | | | | The feature has outlived is usefulness and complicates the code.
* | Merge commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1': dxva2: Simplify some ifdefs Merged-by: Clément Bœsch <u@pkh.me>
| * dxva2: Simplify some ifdefsDiego Biurrun2016-12-11
| |
* | Merge commit '7d81698b89172d2dcf1b78d4b42ba86262360559'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | | | | | * commit '7d81698b89172d2dcf1b78d4b42ba86262360559': vaapi_h265: Fix CFR mode with framerate set in AVCodecContext This commit is a noop, see 37de9ce713ebb65d8b040f4f83ba7542f0754485 Merged-by: Clément Bœsch <u@pkh.me>
| * vaapi_h265: Fix CFR mode with framerate set in AVCodecContextMark Thompson2016-12-10
| | | | | | | | Same issue as 17a0f9481cf07af0feb3838ca315b970117e8000.
* | Merge commit 'ade370a4d7eab1866b6023c91c135d27c77ca465'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | | | | | * commit 'ade370a4d7eab1866b6023c91c135d27c77ca465': lavfi: Add VAAPI deinterlacer This commit is a noop, see 359586f14f46bf3f9c1ae3375d80e8c0fc377bef Merged-by: Clément Bœsch <u@pkh.me>
| * lavfi: Add VAAPI deinterlacerMark Thompson2016-12-10
| |
* | Merge commit 'f8a1ead0ae4402df0503c83f213f57b785a5f20f'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit 'f8a1ead0ae4402df0503c83f213f57b785a5f20f': build: Add -D_XOPEN_SOURCE=600 to CPPFLAGS on Cygwin Merged-by: Clément Bœsch <u@pkh.me>
| * build: Add -D_XOPEN_SOURCE=600 to CPPFLAGS on CygwinDiego Biurrun2016-12-10
| | | | | | | | This is required to make certain math defines visible on modern Cygwin.
* | Merge commit '39fbcf8f76ff2e7cd8d09307e6aacc70ce8f5fed'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | | | | | * commit '39fbcf8f76ff2e7cd8d09307e6aacc70ce8f5fed': configure: Fix _libs vs. _extralibs oversight This commit is a noop, see 9bf3d8408937e101921b3a0090cd6ae116b0c41f Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Fix _libs vs. _extralibs oversightDiego Biurrun2016-12-10
| |
* | Merge commit 'be2d555c980220e65d0ca5c3d78e6cc1e24451a5'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit 'be2d555c980220e65d0ca5c3d78e6cc1e24451a5': build: Use _extralibs variable names instead of _libs everywhere Merged-by: Clément Bœsch <u@pkh.me>
| * build: Use _extralibs variable names instead of _libs everywhereDiego Biurrun2016-12-09
| | | | | | | | This makes naming more consistent and simplifies extralibs-related changes.
* | build: remove special freetype checkClément Bœsch2017-04-17
| | | | | | | | Since 52ccc4a0e was merged, it's pointless to keep our special version.
* | Merge commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | * commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c': build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS Merged-by: Clément Bœsch <u@pkh.me>
| * build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBSDiego Biurrun2016-12-09
| | | | | | | | This is more in line with the other related variable names.
* | Merge commit 'a7101eb40e69ada3872ec5aebe9c5c165745fb3a'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a7101eb40e69ada3872ec5aebe9c5c165745fb3a': configure: Simplify some library checks via check_lib() This commit is a noop as it doesn't apply to FFmpeg: - the nanosleep check doesn't use add_extralibs in FFmpeg - the pthread checks check multiple functions before add the extra libraries Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Simplify some library checks via check_lib()Diego Biurrun2016-12-09
| |
* | Merge commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb'Clément Bœsch2017-04-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb': build: Fix dependencies for alsa/jack/sndio support Added explicit enable (which will be automatically added later on in ee480790c) to actually fix this commit. Without the explicit enables, alsa, jack and sndio gets disabled. Also added jack, alsa and sndio to the have list so the HAVE_* are populated to make (this fixes the SKIPHEADERS chunks). Merged-by: Clément Bœsch <u@pkh.me>
| * build: Fix dependencies for alsa/jack/sndio supportDiego Biurrun2016-12-09
| | | | | | | | | | These components should depend on the availability of the respective libraries, not just on the availability of the respective headers.
* | Merge commit 'af451ac0de6776e97d6a3ff95eac257b7964002e'Clément Bœsch2017-04-15
|\| | | | | | | | | | | | | * commit 'af451ac0de6776e97d6a3ff95eac257b7964002e': configure: Drop redundant and partly bogus vaapi/vdpau header checks Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Drop redundant and partly bogus vaapi/vdpau header checksDiego Biurrun2016-12-09
| | | | | | | | These are taken care of more correctly by the library checks.
* | Merge commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a'Clément Bœsch2017-04-15
|\| | | | | | | | | | | | | * commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a': vdpau: Do not #include vdpau_x11.h from the main vdpau header Merged-by: Clément Bœsch <u@pkh.me>
| * vdpau: Do not #include vdpau_x11.h from the main vdpau headerDiego Biurrun2016-12-09
| | | | | | | | That header should only be included in the special bits that use X11 code.
* | avdevice/decklink: remove pthread dependencyAaron Levinson2017-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Purpose: avdevice/decklink: Removed pthread dependency by replacing semaphore used in code appropriately. Doing so makes it easier to build ffmpeg using Visual C++ on Windows. This is a contination of Kyle Schwarz's "avdevice/decklink: Remove pthread dependency" patch that is available at https://patchwork.ffmpeg.org/patch/2654/ . This patch wasn't accepted, and as far as I can tell, there was no follow-up after it was rejected. Notes: Used Visual Studio 2015 (with update 3) for this. Comments: -- configure: Eliminated pthreads dependency for decklink_indev_deps and decklink_outdev_deps and replaced with threads dependency -- libavdevice/decklink_common.cpp / .h: a) Eliminated semaphore and replaced with a combination of a mutex, condition variable, and a counter (frames_buffer_available_spots). b) Removed include of pthread.h and semaphore.h and now using libavutil/thread.h instead. -- libavdevice/decklink_dec.cpp: Eliminated include of pthread.h and semaphore.h. -- libavdevice/decklink_enc.cpp: a) Eliminated include of pthread.h and semaphore.h. b) Replaced use of semaphore with the equivalent using a combination of a mutex, condition variable, and a counter (frames_buffer_available_spots). In theory, libavutil/thread.h and the associated code could have been modified instead to add cross-platform implementations of the sem_ functions, but an inspection of the ffmpeg source base indicates that there are only two cases in which semaphores are used (including this one that was replaced), so it was deemed to not be worth the effort. Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: fix indentationMarton Balint2017-04-15
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffplay: convert to new decode APIMarton Balint2017-04-15
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | avcodec/dnxhdenc: fix recent regressionPaul B Mahol2017-04-15
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/opus_pvq: Add missing copyright notices from libopus.Carl Eugen Hoyos2017-04-15
| | | | | | | | The file is based on libopus, analyzed by Rostislav Pehlivanov.
* | avformat/hlsenc: add hls encrypt optionsSteven Liu2017-04-14
| | | | | | | | | | | | | | | | | | refer to: https://git.libav.org/?p=libav.git;a=commitdiff;h=0a4b9d0ccd10b3c39105f99bd320f696f69a75a2 add hls encrypt options looks like libav's libavformat/hlsenc.c Reviewed-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* | avcodec/dnxhd*: add ff_dnxhd_get_hr_frame_size()Paul B Mahol2017-04-14
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/dnxhdenc: make sure that mb_height > 255 can be storedPaul B Mahol2017-04-14
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | opus_pvq: add resynth support and band encoding cost functionRostislav Pehlivanov2017-04-14
| | | | | | | | Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | build: fix tools build dependenciesJames Almer2017-04-13
| | | | | | | | | | Found-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360'James Almer2017-04-13
|\| | | | | | | | | | | | | | | | | * commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360': dxva2: Adjust multiple inclusion guard names to follow convention This commit is a noop, see 180f9a09588d1c68983692bb5245213956fdde11 Merged-by: James Almer <jamrial@gmail.com>
| * dxva2: Adjust multiple inclusion guard names to follow conventionDiego Biurrun2016-12-09
| |
* | Merge commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390'James Almer2017-04-13
|\| | | | | | | | | | | | | | | | | * commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390': vf_hwupload_cuda: Add min/max limits for device option This commit is a noop, see4df5a6a26a8aa08bbc6d027c2fb44fcf870e98d7 Merged-by: James Almer <jamrial@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 11:34:55 +0000