aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc/examples/muxing: Fix mixed declaration and codeMichael Niedermayer2015-10-151-1/+1
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'd15368ee3926152a3a301c13cc638fbf7a062ddf'Hendrik Leppkes2015-10-142-1/+9
|\ | | | | | | | | | | | | * commit 'd15368ee3926152a3a301c13cc638fbf7a062ddf': h264: Run VLC init under pthread_once Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * h264: Run VLC init under pthread_onceDerek Buitenhuis2015-10-142-1/+9
| | | | | | | | | | | | | | This makes the h.264 decoder threadsafe to initialize. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'c53e796f8b69799b7ad6d28fbab981d37edf1bc9'Hendrik Leppkes2015-10-141-0/+17
|\| | | | | | | | | | | | | * commit 'c53e796f8b69799b7ad6d28fbab981d37edf1bc9': thread: Provide no-op variants for pthread_once Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * thread: Provide no-op variants for pthread_onceLuca Barbato2015-10-141-0/+17
| |
* | Merge commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0'Hendrik Leppkes2015-10-144-4/+20
|\| | | | | | | | | | | | | * commit '08377f9c3bf6dbe216512a2e05c9fac837b13fc0': dxva: Include last the internal header Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dxva: Include last the internal headerLuca Barbato2015-10-144-4/+20
| | | | | | | | | | It redefines _WIN32_WINNT, possibly causing problems with the w32pthreads.h header.
* | Merge commit 'c1348506697377b46f844339c178332e3314149a'Hendrik Leppkes2015-10-140-0/+0
|\| | | | | | | | | | | | | * commit 'c1348506697377b46f844339c178332e3314149a': httpauth: Add space after commas in HTTP/RTSP auth header Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * httpauth: Add space after commas in HTTP/RTSP auth headerAndrey Utkin2015-10-141-9/+10
| | | | | | | | | | | | | | | | | | | | | | This fixes access to Grandstream cameras, which return 401 otherwise. VLC sends Authorization: header with spaces between parameters, and it is known to work with Grandstream devices and broad range of other HTTP and RTSP servers, so author considers switching to such behaviour safe. See RFC 2617 (HTTP Auth). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e55376a1fd5abebbb0a082aa20739d58c2260a37'Hendrik Leppkes2015-10-141-3/+3
|\| | | | | | | | | | | | | * commit 'e55376a1fd5abebbb0a082aa20739d58c2260a37': rtmpproto: Write correct flv packet sizes at the end of packets Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * rtmpproto: Write correct flv packet sizes at the end of packetsMichael Niedermayer2015-10-141-3/+4
| | | | | | | | | | | | | | In one case it was written as zero, one case left it uninitialized, missed the 11 bytes for the flv header. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | ffmpeg_opt: rename loop option to stream_loopMichael Niedermayer2015-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The "loop" option is used in several demuxers (like img2dec) and muxers, using the same name in ffmpeg_opt breaks them. Feel free to revert this and replace by any other solution or rename both as preferred This is just as a quick fix to avoid the regression with existing command lines and to have both named the same (which does not work) Example: ./ffmpeg -loop 1 -i fate-suite/png1/lena-rgb24.png -t 1 test.avi will produce 25 frames with the img2dec loop but only 1 frame at 25fps with the ffmpeg loop option Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/async: cache some data for fast seek backwardZhang Rui2015-10-141-19/+104
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avutil/fifo: add function av_fifo_generic_peek_at()Zhang Rui2015-10-143-0/+99
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avutil/intmath: use de Bruijn based ff_ctzGanesh Ajjanagadde2015-10-141-25/+7
| | | | | | | | | | | | | | | | | | | | | | It has already been demonstrated that the de Bruijn method has benefits over the current implementation: commit 971d12b7f9d7be3ca8eb98e6c04ed521f83cbd3c. That commit implemented it for long long, this extends it to the int version. Tested with FATE. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Remove test file that accidentally ended up in one commitHendrik Leppkes2015-10-141-0/+0
| |
* | lavf/vc1dec: Autodetect raw vc-1 streams.Carl Eugen Hoyos2015-10-144-6/+83
| | | | | | | | Move the demuxer into its own file.
* | doc/filters: fix selectivecolor exampleClément Bœsch2015-10-141-1/+1
| | | | | | | | Fixes Ticket #4927
* | avfilter/formats: add av_warn_unused_result to function prototypesGanesh Ajjanagadde2015-10-141-0/+17
| | | | | | | | | | | | | | | | This uses the av_warn_unused_result attribute liberally to catch some forms of improper usage of functions defined in avfilter/formats.h. Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avfilter/all: propagate errors of functions from avfilter/formatsGanesh Ajjanagadde2015-10-1463-436/+476
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the functions from avfilter/formats can return errors, usually AVERROR(ENOMEM). This propagates the return values. All of these were found by using av_warn_unused_result, demonstrating its utility. Tested with FATE. I am least sure of the changes to avfilter/filtergraph, since I don't know what/how reduce_format is intended to behave and how it should react to errors. Fixes: CID 1325680, 1325679, 1325678. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Previous version Reviewed-by: Nicolas George <george@nsup.org> Previous version Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | Merge commit '6a23a34274b747280c1e4a00ad22f97f99bbb48a'Hendrik Leppkes2015-10-141-17/+14
|\| | | | | | | | | | | | | * commit '6a23a34274b747280c1e4a00ad22f97f99bbb48a': mimic: drop AVPicture usage Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mimic: drop AVPicture usagewm42015-10-141-17/+14
| | | | | | | | | | | | | | Work on the AVFrame references directly. Instead of setting up a flipped/swapped "view" on the pictures, flip/swap them when returning decoded frames to the API user.
* | Merge commit '6fdd4c678ac1ce0776f9645cd534209e5f1ae1e3'Hendrik Leppkes2015-10-143-26/+27
|\| | | | | | | | | | | | | * commit '6fdd4c678ac1ce0776f9645cd534209e5f1ae1e3': libschroedinger: Properly use AVFrame API Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * libschroedinger: Properly use AVFrame APIVittorio Giovara2015-10-143-25/+28
| | | | | | | | | | | | | | | | Rather than copying data buffers around, allocate a proper frame, and use the standard AVFrame functions. This effectively makes the decoder capable of direct rendering. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '901f9c0a32985f48672fd68594111dc55d88a57a'Hendrik Leppkes2015-10-141-10/+14
|\| | | | | | | | | | | | | * commit '901f9c0a32985f48672fd68594111dc55d88a57a': qtrle: Properly use AVFrame API Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qtrle: Properly use AVFrame APIVittorio Giovara2015-10-141-8/+13
| | | | | | | | | | | | | | Rather than copying data buffers around, just add a reference to the current frame. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '17e41cf3614973258c24aa2452215ef7e3bfa5ed'Hendrik Leppkes2015-10-140-0/+0
|\| | | | | | | | | | | | | * commit '17e41cf3614973258c24aa2452215ef7e3bfa5ed': avcodec: Do not lock during init if there is no init function Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avcodec: Do not lock during init if there is no init functionDerek Buitenhuis2015-10-131-2/+2
| | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | ffmpeg: add deprecation guards around remaining AVFMT_RAWPICTURE usageHendrik Leppkes2015-10-141-1/+8
| |
* | ffmpeg: remove trailing whitespace that sneaked into the previous mergeHendrik Leppkes2015-10-141-1/+1
| |
* | Merge commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e'Hendrik Leppkes2015-10-143-32/+18
|\| | | | | | | | | | | | | | | | | | | * commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e': avformat: Do not use AVFMT_RAWPICTURE Removal from ffmpeg.c not merged because some parts of avdevice still use it Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avformat: Do not use AVFMT_RAWPICTURELuca Barbato2015-10-134-79/+44
| | | | | | | | | | There are no formats supporting it anymore and it is deprecated. Update the documentation accordingly.
* | Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'Hendrik Leppkes2015-10-145-5/+124
|\| | | | | | | | | | | | | * commit '16b0c929621f84983b83b9735ce973acb12723bc': avconv: Add loop option. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * avconv: Add loop option.Alexandra Hájková2015-10-134-5/+121
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '11c5f438ff83da5040e85bfa6299f56b321d32ef'Hendrik Leppkes2015-10-144-5/+16
|\| | | | | | | | | | | | | * commit '11c5f438ff83da5040e85bfa6299f56b321d32ef': dict: Change return type of av_dict_copy() Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dict: Change return type of av_dict_copy()Vittorio Giovara2015-10-124-5/+16
| | | | | | | | | | | | av_dict_set() could return an error, so forward it appropriately. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'c1aac39eaccd32dc3b74ccfcce701d3d888fbc6b'Hendrik Leppkes2015-10-143-5/+363
|\| | | | | | | | | | | | | * commit 'c1aac39eaccd32dc3b74ccfcce701d3d888fbc6b': build: add Solaris symbol versioning Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * build: add Solaris symbol versioningSean McGovern2015-10-114-5/+363
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The versioning facility in the Solaris linker differs from Linux in 3 ways: 1. It does not support globs in linker scripts for symbol versioning -- this is a GNU extension. 2. The linker argument is '-M', instead of '--version-script'. 3. It is picky about line endings. Each symbol or directive must be on a line of it's own. Let's use make_sunver.pl from GCC to generate a version script that works correctly with the Solaris linker. It's function is to correctly expand the globs in the original generated version script. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'Hendrik Leppkes2015-10-141-2/+2
|\| | | | | | | | | | | | | * commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c': nullenc: Use the wrapped avframe pseudo-encoder Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * nullenc: Use the wrapped avframe pseudo-encoderLuca Barbato2015-10-101-2/+2
| |
* | Merge commit 'd00a8fd417ad20cecbc7ca17b25f352655148fb1'Hendrik Leppkes2015-10-141-13/+11
|\| | | | | | | | | | | | | * commit 'd00a8fd417ad20cecbc7ca17b25f352655148fb1': yuv4mpeg: Use the wrapped avframe pseudo-encoder Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * yuv4mpeg: Use the wrapped avframe pseudo-encoderLuca Barbato2015-10-101-12/+11
| |
* | Merge commit '00332e0a064dad866812de9162b009cbaba6f5df'Hendrik Leppkes2015-10-146-1/+85
|\| | | | | | | | | | | | | * commit '00332e0a064dad866812de9162b009cbaba6f5df': wrapped_avframe: Initial implementation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * wrapped_avframe: Initial implementationLuca Barbato2015-10-106-1/+85
| |
* | avformat/mov: fix integer overflowGanesh Ajjanagadde2015-10-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially fixes Ticket 4727. -duration is not a safe expression, since duration can be INT_MIN. One might ask how it can become INT_MIN. Although it is true that line 2574 is no longer reached with INT_MIN due to commit 053e80f6eaf8d87521fe58ea96886b6ee0bbe59d (which fixed another integer overflow issue), mov_update_dts_shift is called on line 3549 as well, right after a read of untrusted data. One can do the fix locally there, but that function is already a huge mess. Changing mov_update_dts_shift is likely better. This changes duration to INT_MIN + 1 in such cases. This should not make any practical difference since such streams are anyway fuzzer files. Tested with FATE. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | ffserver_config: check for INT_MIN before doing FFABSGanesh Ajjanagadde2015-10-131-1/+1
| | | | | | | | | | | | | | | | FFABS(INT_MIN) is not safe. Alternative of using FFNABS is not as readable. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | x86/vp9itxfm: fix register clobbering in ff_vp9_idct_idct_4x4_add_12_sse2James Almer2015-10-131-1/+1
| | | | | | | | | | Reviewed-by: Henrik Gramner <henrik@gramner.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | dnxhdenc: fix access outside of imageChristophe Gisquet2015-10-131-2/+4
| | | | | | | | This is the same test as for the 8bit case.
* | x86: simple_idct10_template: use constChristophe Gisquet2015-10-135-57/+39
| | | | | | | | | | | | | | | | This avoid going through constants.c while still sharing them with proresdsp.asm Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avutil/fifo: Fix thread saftey of av_fifo_generic_peek()Michael Niedermayer2015-10-131-8/+6
| | | | | | | | | | | | | | changing the context state and restoring it is not safe if another thread writes data into the fifo Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 05:03:02 +0000