summaryrefslogtreecommitdiff
path: root/libavutil/parseutils.c
Commit message (Collapse)AuthorAge
* Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'Michael Niedermayer2015-07-21
|\ | | | | | | | | | | | | | | | | | | | | * commit '219b39a71a5694b1c14a07b86477f665a5b6849b': parseutil: Use non ambiguous aliases for uhd Conflicts: doc/ffmpeg.texi libavutil/parseutils.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * parseutil: Use non ambiguous aliases for uhdLuca Barbato2015-07-21
| | | | | | | | uhd1 and uhd2 would be ambigous.
* | Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'Michael Niedermayer2015-07-20
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2': parseutil: Add more resolution aliases Conflicts: doc/ffmpeg.texi libavutil/parseutils.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * parseutil: Add more resolution aliasesLuca Barbato2015-07-20
| | | | | | | | Add DCI 2k and 4k and uhd1 and uhd2.
| * parseutils: Make av_small_strptime publicLuca Barbato2015-04-07
| | | | | | | | | | | | And use it in libavformat. Based on a similar patch by Stefano Sabatini <stefasab@gmail.com>.
* | Merge commit '108f2f381acb93827fb4add0517eeae859afa3bf'Michael Niedermayer2015-04-07
|\| | | | | | | | | | | | | | | | | | | * commit '108f2f381acb93827fb4add0517eeae859afa3bf': parseutils: Extend small_strptime to be used in avformat Conflicts: libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * parseutils: Extend small_strptime to be used in avformatLuca Barbato2015-04-06
| | | | | | | | The strptime implementation is supposed to support whitespace and %T.
* | Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'Michael Niedermayer2015-02-14
|\| | | | | | | | | | | | | | | | | | | | | * commit 'bf704132a51f5d838365158331d4e535e1df4c8e': Don't anonymously typedef structs Conflicts: avprobe.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't anonymously typedef structsDiego Biurrun2015-02-14
| |
* | Merge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'Michael Niedermayer2014-10-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de': Use gmtime_r instead of gmtime and localtime_r instead of localtime Conflicts: libavformat/mov.c libavformat/mxfenc.c libavformat/wtvdec.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Use gmtime_r instead of gmtime and localtime_r instead of localtimeMartin Storsjö2014-10-26
| | | | | | | | | | | | | | | | | | | | | | gmtime isn't thread safe in general. In msvcrt (which lacks gmtime_r), the buffer used by gmtime is thread specific though. One call to localtime is left in avconv_opt.c, where thread safety shouldn't matter (instead of making avconv depend on the libavutil internal header). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'Michael Niedermayer2013-12-12
|\| | | | | | | | | | | | | | | | | | | | | * commit '6b45f05ef5b241fd1513702119af9c30056a0ac5': parseutils: fix discarding const attribute warning Conflicts: libavutil/parseutils.c See: fe87b2e79c734a111747a239943c7340f8d3f7d7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * parseutils: fix discarding const attribute warningVittorio Giovara2013-12-12
| |
| * Use the avstring.h locale-independent character type functionsReimar Döffinger2013-03-07
| | | | | | | | | | | | Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavu/parseutils: add av_get_known_color_name()Stefano Sabatini2013-10-27
| |
* | lavu/parseutils: add more resolutionsNiv Sardi2013-10-07
| | | | | | | | | | | | | | See http://en.wikipedia.org/wiki/Graphics_display_resolution Signed-off-by: Niv Sardi <xaiki@evilgiggle.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | avutil/parseutils:make const tables static constMichael Niedermayer2013-08-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Force using a 64bit intermediate when calculating calendar time with ↵Carl Eugen Hoyos2013-03-08
| | | | | | | | | | | | av_timegm(). Fixes a fate failure with icc 13.1
* | Remove incorrect use of ctype.h functions.Reimar Döffinger2013-03-03
| | | | | | | | | | | | | | As far as I can tell the code should not change behaviour depending on locale in any of these places. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lavu/parseutils: allow MM:SS format for duration in av_parse_time()Senthilnathan M2013-02-22
| | | | | | | | | | | | | | Fix trac ticket #2258. Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavu/parseutils: add digital cinema frame sizesDave Rice2013-02-03
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'Michael Niedermayer2012-12-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967': Remove pointless #undefs of previously forbidden functions. fate: Add dependencies for bmp, cdxl, dfa, mp3 Conflicts: doc/examples/muxing.c libavfilter/filtfmts.c libavutil/des.c libavutil/eval.c libavutil/log.c libavutil/parseutils.c tests/fate/mp3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove pointless #undefs of previously forbidden functions.Anton Khirnov2012-12-04
| |
* | lavu/parseutils: accept %J for hours >= 24.Nicolas George2012-12-02
| | | | | | | | Allow to parse durations >= 24:00:00.
* | lavu/parseutils: add trailing characters check in av_parse_video_size()Stefano Sabatini2012-10-29
| | | | | | | | | | Return an error in case the video size specifications contains spurious trailing chars, like in "320x240foobar".
* | lavu/parseutils: remove unused gcd variable in av_parse_ratio()Stefano Sabatini2012-10-22
| | | | | | | | Fix warning.
* | lavu/parseutils: rework rational reduction logic in av_parse_ratio()Stefano Sabatini2012-10-20
| | | | | | | | | | | | | | | | | | Avoid to divide num and den by gcd in case of a parsed expression, since that is already done in av_d2q(), and force reduction in case of "a:b" form, allowing to honour the max parameter. The latter change is consistent with the a/b case, and with the documentation.
* | Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'Michael Niedermayer2012-10-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e002e3291e6dc7953f843abf56fc14f08f238b21': Use the new aes/md5/sha/tree allocation functions avutil: Add functions for allocating opaque contexts for algorithms svq3: fix pointer type warning svq3: replace unsafe pointer casting with intreadwrite macros parseutils-test: various cleanups Conflicts: doc/APIchanges libavcodec/svq3.c libavutil/parseutils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * parseutils-test: various cleanupsMans Rullgard2012-10-11
| | | | | | | | | | | | | | | | | | - make tables static const - remove useless use of compound literal - break long lines - fix a comma/semicolon typo Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit '15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41'Michael Niedermayer2012-10-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '15ba7f6525c0f56f0c8e3e3e0c0c5129de054f41': parseutils: fix const removal warning prepare 9_beta1 release Conflicts: Changelog RELEASE libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * parseutils: fix const removal warningMans Rullgard2012-10-11
| | | | | | | | | | | | | | | | | | | | The const qualifier is still removed although it happens inside the strtol() function so no warning is generated. Fixes: libavutil/parseutils.c:110:11: warning: assignment discards qualifiers from pointer target type Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'Michael Niedermayer2012-10-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6': avio: introduce avio_closep mpegtsenc: set muxing type notification to verbose vc1dec: Use correct spelling of "opposite" a64multienc: change mc_frame_counter to unsigned arm: call arm-specific rv34dsp init functions under if (ARCH_ARM) svq1: Drop a bunch of useless parentheses parseutils-test: do not print numerical error codes svq1: K&R formatting cosmetics Conflicts: doc/APIchanges libavcodec/svq1dec.c libavcodec/svq1enc.c libavformat/version.h libavutil/parseutils.c tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * parseutils-test: do not print numerical error codesMans Rullgard2012-10-10
| | | | | | | | | | | | | | The error codes differ between systems so printing the value makes the fate test fail on some systems. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: wmaenc: use float planar sample format (e)ac3enc: use planar sample format aacenc: use planar sample format adpcmenc: use planar sample format for adpcm_ima_wav and adpcm_ima_qt adpcmenc: move 'ch' variable to higher scope adpcmenc: fix 3 instances of variable shadowing adpcm_ima_wav: simplify encoding libvorbis: use planar sample format libmp3lame: use planar sample formats vorbisenc: use float planar sample format ffm: do not write or read the audio sample format parseutils: fix parsing of invalid alpha values doc/RELEASE_NOTES: update for the 9 release. smoothstreamingenc: Add a more verbose error message smoothstreamingenc: Ignore the return value from mkdir smoothstreamingenc: Try writing a manifest when opening the muxer smoothstreamingenc: Move the output_chunk_list and write_manifest functions up smoothstreamingenc: Properly return errors from ism_flush to the caller smoothstreamingenc: Check the output UrlContext before accessing it Conflicts: doc/RELEASE_NOTES libavcodec/aacenc.c libavcodec/ac3enc_template.c libavcodec/wmaenc.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * parseutils: fix parsing of invalid alpha valuesMans Rullgard2012-10-06
| | | | | | | | | | | | | | | | | | | | An alpha specifier outside the valid range results in a conversion from double to long with undefined result. Range-checking the double and only converting it after it passes avoids this. Fixes fate-parseutils errors on some systems. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * parseutils-test: Drop random colors from parsing testDiego Biurrun2012-10-06
| | | | | | | | This guarantees stable output for comparing test results.
* | fate: add av_small_strptime() test to fate-parseutilsStefano Sabatini2012-09-17
| |
* | lavu/parseutils: fix av_small_strptime() whitespace directive parsingStefano Sabatini2012-09-17
| | | | | | | | | | | | | | | | | | According to POSIX, strptime() should consume whitespaces in the date string everytime a whitespace conversion specification is found in the date format specification. Make av_small_strptime() conform with this behavior. In particular, should fix trac ticket #1739.
* | lavu/parseutils: add av_small_strptime()Stefano Sabatini2012-09-06
| | | | | | | | | | | | | | | | | | Make internal small_strptime() function public, and use it in place of strptime(). This allows to avoid a dependency on strptime() on systems which do not support it. In particular, fix trac ticket #992.
* | lavu/parseutils: make small_strptime() return a (non const) char *Stefano Sabatini2012-09-06
| | | | | | | | This is consistent with the standard definition of strptime().
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't include common.h from avutil.hMartin Storsjö2012-08-15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | parseutils: ignore digits below the microsecond.Nicolas George2012-07-10
| | | | | | | | | | Accept 1.1234567 as simply 1.123456 instead of rejecting it. The rounding is towards 0, which is acceptable and much simpler.
* | parseutils: fix sorting of colorsPaul B Mahol2012-06-28
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: MS Screen 1 decoder aacdec: Fix popping channel layouts. av_gettime: support Win32 without gettimeofday() Use av_gettime() in various places Move av_gettime() to libavutil dct-test: use emms_c() from libavutil instead of duplicating it mov: fix operator precedence bug mathematics.h: remove a couple of math defines Remove unnecessary inclusions of [sys/]time.h lavf: remove unnecessary inclusions of unistd.h bfin: libswscale: add const where appropriate to fix warnings bfin: libswscale: remove unnecessary #includes udp: Properly check for invalid sockets tcp: Check the return value from getsockopt network: Use av_strerror for getting error messages udp: Properly print error from getnameinfo mmst: Use AVUNERROR() to convert error codes to the right range for strerror network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows rtmp: Reduce the number of idle posts sent by sleeping 50ms Conflicts: Changelog configure libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dct-test.c libavcodec/version.h libavformat/riff.c libavformat/udp.c libavutil/Makefile libswscale/bfin/yuv2rgb_bfin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unnecessary inclusions of [sys/]time.hMans Rullgard2012-06-20
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | tests/parseutils: change test to make it platform independentStefano Sabatini2012-06-11
| | | | | | | | | | Make the test independent from the actual error string used to describe a certain error code.
* | parseutils: use strings instead of integers for error codes.Michael Niedermayer2012-05-09
| | | | | | | | | | | | error values can differ between platforms. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | parseutils: fix ;/, errorMichael Niedermayer2012-05-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | parseutils: replace setenv() by putenv().Nicolas George2012-04-27
| | | | | | | | putenv() seems to be more portable.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 09:09:16 +0000