summaryrefslogtreecommitdiff
path: root/libavutil
Commit message (Collapse)AuthorAge
* Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer2014-08-15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867': cosmetics: Write NULL pointer inequality checks more compactly Conflicts: libavcodec/dvdsubdec.c libavcodec/h263dec.c libavcodec/libxvid.c libavcodec/rv10.c libavcodec/utils.c libavformat/format.c libavformat/matroskadec.c libavformat/segment.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | * commit '7c371754fbc0dcc23bd00278b147f8095ccc5625': atomic_win32: Drop unnecessary atomic.h #include Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * atomic_win32: Drop unnecessary atomic.h #includeDiego Biurrun2014-08-15
| | | | | | | | The file does not require atomic.h. Also kills function redefinition warnings.
| * frame: Remove some FF_API_AVFRAME_COLORSPACE leftoversDiego Biurrun2014-08-14
| |
| * cpu-test: Add unistd.h #include for getopt()Diego Biurrun2014-08-13
| |
* | avutil/opt: remove disabled old ABI compatibility codeMichael Niedermayer2014-08-14
| | | | | | | | | | | | Fixes some unused variable warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8ddc32629a6d6be77256694c9e322dde134609f3'Michael Niedermayer2014-08-14
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '8ddc32629a6d6be77256694c9e322dde134609f3': mem: add av_strndup() for duplicating substrings Conflicts: libavutil/mem.c libavutil/mem.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mem: add av_strndup() for duplicating substringsAnton Khirnov2014-08-13
| |
* | Merge commit '159a06dfc83d189f753c4583583ddfb571552ff5'Michael Niedermayer2014-08-14
|\| | | | | | | | | | | | | * commit '159a06dfc83d189f753c4583583ddfb571552ff5': stereo3d: initialize AVStereo3D to zero Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * stereo3d: initialize AVStereo3D to zeroFelix Abecassis2014-08-13
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'a8c104a511f97e4ea617df73b31737e28a8a5126'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'a8c104a511f97e4ea617df73b31737e28a8a5126': AVOption: add support for dictionary types. Conflicts: libavutil/opt.c libavutil/opt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * AVOption: add support for dictionary types.Andrew Stone2014-08-13
| | | | | | | | | | | | | | In order to support metadata being set as an option, it's necessary to be able to set dictionaries as values. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avutil: turn arm setend into a cpuflagMichael Niedermayer2014-08-13
| | | | | | | | | | | | | | | | | | | | | | this allows disabling and enabling it it also prevents crashes if vfpv3 and neon are disabled which previously would have enabled the flag And last but not least one can enable setend on cpus like cortex-a8 where its fast but disabled by default Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu: stop exporting internal functionsJames Almer2014-08-12
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter()James Almer2014-08-12
| | | | | | | | | | | | | | It was wrongly being exported and used by libavfilter. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove panscan information in av_frame_copy_props() if resolution changes.Carl Eugen Hoyos2014-08-10
| | | | | | | | Fixes ticket #3750.
* | Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45': avresample: Introduce AVFrame-based API Conflicts: libavresample/utils.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avresample: Introduce AVFrame-based APILuca Barbato2014-08-10
| |
* | Merge commit '472f9ed312ec784f7c72876b77163f4741880d05'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '472f9ed312ec784f7c72876b77163f4741880d05': Remove obsolete FF_API_AVFRAME_COLORSPACE cruft. Conflicts: libavcodec/utils.c libavutil/frame.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.Anton Khirnov2014-08-09
| |
* | Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8': Bump major versions of all libraries. Conflicts: doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h libavutil/version.h libswscale/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Bump major versions of all libraries.Anton Khirnov2014-08-09
| |
* | drop LLS1, rename LLS2 to LLSMichael Niedermayer2014-08-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: delay removial of FF_API_GET_CHANNEL_LAYOUT_COMPATMichael Niedermayer2014-08-09
| | | | | | | | | | | | avoids fate failure of join filter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | delay removial of FF_API_CODEC_ID, FF_API_OLD_AVOPTIONS and ↵Michael Niedermayer2014-08-09
| | | | | | | | | | | | | | | | | | FF_API_OLD_ENCODE_VIDEO This prevents a build failure when bumping. the uses could easily be updated / removed, if people prefer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'Michael Niedermayer2014-08-09
|\| | | | | | | | | | | | | * commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e': Postpone API-incompatible changes until the next bump. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Postpone API-incompatible changes until the next bump.Anton Khirnov2014-08-09
| |
* | avutil/cpu: check av_parse_cpu_caps() table during cpu-testMichael Niedermayer2014-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/cpu: Make cpu flag names match between cpu-test and ↵Michael Niedermayer2014-08-06
| | | | | | | | | | | | av_parse_cpu_caps() tables Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/cpu: add aarch64 entries to 2nd tableMichael Niedermayer2014-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/cpu: output cpu data to stdoutMichael Niedermayer2014-08-06
| | | | | | | | | | | | | | | | | | Errors go to stderr, but the cpu stats are non error output for cputest This fixes echoing the cpu test results Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixelutils: check for malloc failureMichael Niedermayer2014-08-06
| | | | | | | | | | Found-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pixelutils: avoid on stack arraysMichael Niedermayer2014-08-06
| | | | | | | | | | | | | | The arrays are fairly large and could cause problems on some embedded systems also they are not endian safe as they mix 32 and 8bit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/cpu: fix cpu-test to work with ffmpegs cpuflags syntaxMichael Niedermayer2014-08-06
| | | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil: add pixelutils APIClément Bœsch2014-08-05
| |
* | Fix compile error on bfin.Bernd Kuhls2014-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the removal of all Blackfin architecture optimizations in http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b55d3bbeed375f7b74442c4dd274d116a3e3d2e1 some includes were left behind leading to a compile error: CC libavformat/adtsenc.o In file included from ./libavcodec/get_bits.h:35, from ./libavcodec/ac3_parser.h:27, from libavformat/ac3dec.c:23: ./libavcodec/mathops.h:43:29: error: bfin/mathops.h: No such file or directory This compile error was found by buildroot autobuild system: http://autobuild.buildroot.net/results/ae0/ae056f267e907091d09d2a1546d6f1ae02fa23b9/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6'Michael Niedermayer2014-08-04
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6': avutil: add AV_PIX_FMT_YA16 pixel format Conflicts: libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: add AV_PIX_FMT_YA16 pixel formatVittorio Giovara2014-08-04
| |
* | Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'Michael Niedermayer2014-08-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5': avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8 Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/raw.c libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h libswscale/swscale_internal.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8Vittorio Giovara2014-08-04
| | | | | | | | | | | | | | The rationale is that you have a packed format in form <greyscale sample> <alpha sample> <greyscale sample> <alpha sample> and shortening greyscale to 'G' might make one thing about Greenscale instead. An alias pixel format and color space name are provided for compatibility.
* | Merge commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98'Michael Niedermayer2014-08-04
|\| | | | | | | | | | | | | * commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98': avutil: add alias names for gray 8/16 colour spaces Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avutil: add alias names for gray 8/16 colour spacesVittorio Giovara2014-08-04
| |
* | Merge commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26'Michael Niedermayer2014-08-04
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd2962e9f89cca6ff40f0c9d5ffc9c4397b8b1b26': pixdesc: Support pixelformat aliases Conflicts: doc/APIchanges libavutil/pixdesc.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pixdesc: Support pixelformat aliasesLuca Barbato2014-08-04
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'bb41115d56930b9f5d59e79dca254d1201246967'Michael Niedermayer2014-08-04
|\| | | | | | | | | | | | | | | | | | | | | * commit 'bb41115d56930b9f5d59e79dca254d1201246967': imgutils: Do not declare avpriv_set_systematic_pal2 in the public header Conflicts: libavutil/internal.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * imgutils: Do not declare avpriv_set_systematic_pal2 in the public headerDiego Biurrun2014-08-04
| |
* | Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'Michael Niedermayer2014-08-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a': avcodec: Deprecate dtg_active_format field in favor of avframe side-data Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/mpeg12dec.c libavcodec/version.h libavfilter/vf_showinfo.c libavutil/frame.h libavutil/version.h See: 2a3c36e920d958e99fb4edf065a6713c30f2c2a9 Merged-by: Michael Niedermayer <michaelni@gmx.at>