FFmpeg

Commit Graph

Author	SHA1	Message	Date
Michael Niedermayer	b1eb92a6bc	Merge remote-tracking branch 'qatar/master' * qatar/master: libx264: check color_range Conflicts: libavcodec/libx264.c See: `48d39c8786` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	34e325efa5	Merge commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24' * commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24': ljpeg: check color_range Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	987b873049	Merge commit '2183432e6dc8aedf1ef3db63006a2a8195479abd' * commit '2183432e6dc8aedf1ef3db63006a2a8195479abd': mdec: set color_range Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	020baa0be6	Merge commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347' * commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347': mjpeg: set color_range Conflicts: libavcodec/mjpegdec.c See: `2f870e262e` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ca0e6fa731	Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181' * commit '6612a03d7470af4aa6b8aa313b1eff013691d181': fraps: set color_range Conflicts: libavcodec/fraps.c See: `79f452f4e6` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	1c79ca272d	Merge commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4' * commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4': tiff: Support rgba encoding Conflicts: libavcodec/tiffenc.c See: `d7fc100694` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ba7cdb970f	Merge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851' * commit '6d78e852fbf3cab438a2085bcb64b90457c4a851': img2: add j2c file extension Conflicts: libavformat/img2enc.c See: `e8df18270a` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	c738ffcf2c	Merge commit '58c215961a9067bb670387bbd72286c30de04b93' * commit '58c215961a9067bb670387bbd72286c30de04b93': raw, nut: Support rgba64 encoding Conflicts: libavcodec/raw.c libavformat/nut.c See: `edf34c346e` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	3731c40989	Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9' * commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9': png: Support rgb48 and rgba64 encoding Conflicts: libavcodec/pngenc.c See: `f94ce3bcab` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	a00d4c5956	Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186' * commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186': png: K&R formatting cosmetics Conflicts: libavcodec/png.c libavcodec/pngdec.c libavcodec/pngenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	b361a0bf1f	Merge commit 'f7518f1a0e0a1788c303de3c6198da07e575710c' * commit 'f7518f1a0e0a1788c303de3c6198da07e575710c': codec_desc: update dvaudio tag Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	85d28a8656	Merge commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8' * commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8': isom: fix C99-style declaration See: `cd0982e189` Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	6b1ca1709f	Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30' * commit '1481d24c3a0abf81e1d7a514547bd5305232be30': RGBA64 pixel formats Conflicts: doc/APIchanges libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h libswscale/utils.c See: `9569a3c9f4` See: `92afb43162`, as well as others Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	ad9a6e19e1	Merge commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658' * commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658': h264 does not depend on mpegvideo any more Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	3e3b0b3a40	avcodec/vdpau: update ff_vdpau_h264_set_reference_frames() to H264Picture Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	dc226c023d	Merge commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2' * commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2': mpegvideo: remove h264-only fields Conflicts: libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	329a3286d6	Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02' * commit 'be039278b5ebd8075d90a3508db2aed5adf59e02': mpegvideo: move ff_draw_horiz_band() to mpegutils.c Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	29be9b5301	avcodec/dxva2: fix pointers after H264Picture Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	2a37e560dc	avcodec/vdpau: fix ff_vdpau_get_surface_id() argument after H264Picture Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	377cfc28a2	avcodec/vaapi: fix pointer types after H264Picture changes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	9517900bef	Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b' * commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_mvpred.h libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	3e5833802e	Merge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d' * commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d': h264: Remove MotionEstContext and move the relevant fields to H264Context Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	bb3c0571d3	Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c' * commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c': h264: Replace mpegvideo-specific MAX_THREADS by private define Conflicts: libavcodec/h264.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	a81a2b514e	Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27' * commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27': h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define Conflicts: libavcodec/h264.c libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	6102dda1d7	avcodec/h264: h264_set_erpic() clear destination Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	c237e88d51	Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87' * commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87': h264: move relevant fields from Picture to H264Picture Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	4f22e39e65	avcodec/error_resilience: fix the case when MVs are not available Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	8ef9dcf1d7	avcodec/mpegvideo: ff_mpeg_set_erpic() clear destination Fixes crash Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	533bc4c0a3	Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672' * commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672': er: move relevant fields from Picture to ERPicture Conflicts: libavcodec/error_resilience.c libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	3dab9e804a	Merge commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e' * commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e': h264: directly use frames in ff_h264_draw_horiz_band() Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	3ddf9b5b77	Merge commit '75af13a' * commit '75af13a': mpegvideo: directly use frames in ff_draw_horiz_band() Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Matt Oliver	b73aae6fe9	avcodec/x86/idct_sse2_xvid: move offsets out of MANGLE() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	8e92ff2546	avcodec/h264: be more tolerant on what pixel format changes trigger reinits Fixes Ticket3260 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Matt Oliver	9eb3f11c55	Add missing external declarations. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Matt Oliver	590805b7c3	Fixed 64bit conformance with mvzbl. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	2f955d572b	swscale/x86/swscale: remove unused constants Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Vittorio Giovara	75177b2f5e	libx264: check color_range	11 years ago
Vittorio Giovara	bf0d7da7cb	ljpeg: check color_range	11 years ago
Vittorio Giovara	2183432e6d	mdec: set color_range	11 years ago
Vittorio Giovara	1c1fbc70ca	mjpeg: set color_range	11 years ago
Vittorio Giovara	6612a03d74	fraps: set color_range	11 years ago
Carl Eugen Hoyos	5b1b91cfb8	tiff: Support rgba encoding	11 years ago
Jean First	6d78e852fb	img2: add j2c file extension Some applications use the j2c extension for jpeg2000 codestream files.	11 years ago
Carl Eugen Hoyos	58c215961a	raw, nut: Support rgba64 encoding	11 years ago
Carl Eugen Hoyos	cccac7654f	png: Support rgb48 and rgba64 encoding	11 years ago
Vittorio Giovara	c598b569fb	png: K&R formatting cosmetics	11 years ago
Vittorio Giovara	f7518f1a0e	codec_desc: update dvaudio tag	11 years ago
Michael Niedermayer	6d7b22fb8f	isom: fix C99-style declaration	11 years ago
Jean First	1481d24c3a	RGBA64 pixel formats Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>	11 years ago
Vittorio Giovara	d24e9a99a4	h264 does not depend on mpegvideo any more	11 years ago

1 2 3 4 5 ...

61561 Commits (b1eb92a6bcdaa57a150a7493bc29f82cbc36ef99) All Branches Search

61561 Commits (b1eb92a6bcdaa57a150a7493bc29f82cbc36ef99)

All Branches