avcodec/mjpegenc: the AMV encoder doesnt support yuv422

Fixes Ticket3883 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b227be34db) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Changelog: add 2.4
2014-09-14 17:46:33 +02:00 · 2014-09-14 16:53:20 +02:00 · 2014-09-14 16:53:19 +02:00 · 2014-09-14 16:00:15 +02:00 · 2014-09-14 15:57:32 +02:00 · 2014-09-14 15:37:11 +02:00
7 changed files with 8 additions and 8 deletions
--- a/2
+++ b/2
@ -2,6 +2,8 @@ Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.

 version <next>:
+
+version 2.4:
 - Icecast protocol
 - ported lenscorrection filter from frei0r filter
 - large optimizations in dctdnoiz to make it usable
--- a/2
+++ b/2
@ -534,7 +534,7 @@ x86                                     Michael Niedermayer
 Releases
 ========

-2.3                                     Michael Niedermayer
+2.4                                     Michael Niedermayer
 2.2                                     Michael Niedermayer
 1.2                                     Michael Niedermayer

--- a/2
+++ b/2
@ -1 +1 @@
-2.3.git
+2.4
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@ -31,7 +31,7 @@ PROJECT_NAME           = FFmpeg
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.

-PROJECT_NUMBER         =
+PROJECT_NUMBER         = 2.4

 # With the PROJECT_LOGO tag one can specify a logo or icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
--- a/doc/examples/resampling_audio.c
+++ b/doc/examples/resampling_audio.c
@ -199,8 +199,7 @@ int main(int argc, char **argv)
            fmt, dst_ch_layout, dst_nb_channels, dst_rate, dst_filename);

 end:
-    if (dst_file)
-        fclose(dst_file);
+    fclose(dst_file);

    if (src_data)
        av_freep(&src_data[0]);
--- a/doc/examples/scaling_video.c
+++ b/doc/examples/scaling_video.c
@ -132,8 +132,7 @@ int main(int argc, char **argv)
           av_get_pix_fmt_name(dst_pix_fmt), dst_w, dst_h, dst_filename);

 end:
-    if (dst_file)
-        fclose(dst_file);
+    fclose(dst_file);
    av_freep(&src_data[0]);
    av_freep(&dst_data[0]);
    sws_freeContext(sws_ctx);
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@ -241,7 +241,7 @@ AVCodec ff_amv_encoder = {
    .encode2        = amv_encode_picture,
    .close          = ff_mpv_encode_end,
    .pix_fmts       = (const enum AVPixelFormat[]){
-        AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_NONE
+        AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NONE
    },
 };
 #endif
Author	SHA1	Message	Date
Michael Niedermayer	ace90ee265	avcodec/mjpegenc: the AMV encoder doesnt support yuv422 Fixes Ticket3883 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit `b227be34db`) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-14 17:46:33 +02:00
Michael Niedermayer	703bd31647	Changelog: add 2.4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit `808db3e687`) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-14 16:53:20 +02:00
Michael Niedermayer	c16e80ee3d	doc/examples: remove unneeded NULL checks dst_file cannot be NULL Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit `68bca03951`) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-14 16:53:19 +02:00
Michael Niedermayer	66ac5b96e8	MAINTAINERS: Add 2.4 to maintained releases, drop 2.3 2.2 is used by 4 distributions, 2.3 by none, thus continuing maintaining 2.2 makes more sense than 2.3 see: https://trac.ffmpeg.org/wiki/Downstreams Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit `da2186be81`) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-14 16:00:15 +02:00
Michael Niedermayer	547cad8c81	Merge commit 'f851477889ae48e2f17073cf7486e1d5561b7ae4' into release/2.4 * commit 'f851477889ae48e2f17073cf7486e1d5561b7ae4': (26 commits) Prepare for 11 release doc: Fix syntax and logical errors in avconv stream combination example Fix RELEASE identification Mark 11 release in the changelog Add release notes for 11. avcodec: fix missing doxygen comment marker Prepare for 11_beta2 Release license: Mention that vf_interlace is GPL, not LGPL matroskaenc: convert avstream stereo3d side data during encoding matroskadec: parse stereo mode on decoding avcodec: add stream-level stereo3d side data matroska: list supported extensions doc/APIchanges: fill in missing hashes and dates pulse: Add a wallclock option to be compatible with other other captures vc1: Initialize start_code_found to 0 avconv: fix parsing the AVOptions for -target avconv: fix the muxrate values for -target mpegenc: limit the maximum muxrate vc1: Fix the skip condition vfwcap: Add fallback define for HWND_MESSAGE ... Conflicts: Changelog LICENSE.md RELEASE doc/APIchanges doc/RELEASE_NOTES doc/ffmpeg.texi ffmpeg_opt.c libavcodec/avcodec.h libavcodec/error_resilience.c libavcodec/utils.c libavcodec/vc1_parser.c libavcodec/version.h libavdevice/pulse_audio_dec.c libavfilter/setpts.c libavfilter/src_movie.c libavformat/electronicarts.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mpegenc.c Merge for metadata only, all these backports are already present in release/2.4 as its branched off from master at a later point so that all these changes where in master already. Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-14 15:57:32 +02:00
Michael Niedermayer	55b1a1e9c1	update for 2.4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-09-14 15:37:11 +02:00
Diego Biurrun	f851477889	Prepare for 11 release	2014-09-13 11:14:46 -07:00
Diego Biurrun	4f2d4b98fc	doc: Fix syntax and logical errors in avconv stream combination example Bug-Id: 661 CC: libav-stable@libav.org (cherry picked from commit `775a0b04f0`) Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-09-10 12:01:16 -07:00
Sean McGovern	7d8ebb8774	Fix RELEASE identification This was accidentally left over in `b5d4f49e3c`	2014-09-08 20:58:45 -04:00
Diego Biurrun	07b0ccf511	Mark 11 release in the changelog Also fix some typos in the entries for the 11 release. (cherry picked from commit `d9792b7735`) Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-09-04 15:20:11 -07:00
Anton Khirnov	9d3e69ae30	Add release notes for 11. (cherry picked from commit `12f0388f9c`) Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-09-04 08:25:45 -07:00
Michael Niedermayer	480633c6c2	avcodec: fix missing doxygen comment marker	2014-09-01 00:48:58 +01:00
Reinhard Tartler	b5d4f49e3c	Prepare for 11_beta2 Release	2014-08-30 11:51:28 -04:00
Diego Biurrun	4cde8bae49	license: Mention that vf_interlace is GPL, not LGPL (cherry picked from commit `9e8bbe7d4d`) Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-08-28 10:50:34 -07:00
Vittorio Giovara	5b740d1eaa	matroskaenc: convert avstream stereo3d side data during encoding Write the StereoMode Embl to bitstream.	2014-08-28 13:07:17 -04:00
Vittorio Giovara	152e09fde7	matroskadec: parse stereo mode on decoding Convert the Matroska stereo format to the Stereo3D format, and add a Stereo3D side data to the stream. Bump the doctype version supported. Bug-Id: 728 / https://bugs.debian.org/757185	2014-08-28 13:07:17 -04:00
Vittorio Giovara	110841c3ab	avcodec: add stream-level stereo3d side data	2014-08-28 13:05:31 -04:00
Vittorio Giovara	5694831e06	matroska: list supported extensions	2014-08-28 13:05:31 -04:00
Anton Khirnov	1f52f82a55	doc/APIchanges: fill in missing hashes and dates	2014-08-28 13:02:15 -04:00
Luca Barbato	e62f08ca8d	pulse: Add a wallclock option to be compatible with other other captures alsa and x11grab use av_gettime() to report timestamps. Have it on by default. Bug-Id: 647 (cherry picked from commit `424b929b5c`) (cherry picked from commit `404731bd20`) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>	2014-08-28 11:13:19 +02:00
Luca Barbato	ee099059e7	vc1: Initialize start_code_found to 0	2014-08-27 12:38:09 +02:00
Anton Khirnov	e2a89f7f0f	avconv: fix parsing the AVOptions for -target CC: libav-stable@libav.org (cherry picked from commit `f5245a9c62`) Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-27 06:25:26 +00:00
Anton Khirnov	7c46855074	avconv: fix the muxrate values for -target The mpegenc private option values are in 50-byte units. CC: libav-stable@libav.org (cherry picked from commit `1688eef253`) Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-27 06:25:25 +00:00
Anton Khirnov	c2d6cc2971	mpegenc: limit the maximum muxrate It is written to the file as a 22-bit value. CC: libav-stable@libav.org (cherry picked from commit `75bbaf2493`) Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-27 06:25:24 +00:00
Luca Barbato	8c91414803	vc1: Fix the skip condition As written in the comment above, skip must be added only if a start code is found.	2014-08-26 14:47:45 +02:00
Diego Biurrun	0263750a0d	vfwcap: Add fallback define for HWND_MESSAGE Some obsolete versions of the MinGW32 runtime (<4.0.0) lack the definition. (cherry picked from commit `ab56fabe62`) Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-08-25 17:17:29 -07:00
Diego Biurrun	63795fe5b9	setpts: Add missing inttypes.h #include for PRId64 Also convert a debug av_log() to av_dlog(). (cherry picked from commit `593aaee953`) Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-08-24 13:00:53 -07:00
Diego Biurrun	d2bad216f7	mpeg12enc: Add missing #include for PICT_FRAME (cherry picked from commit `8fc6a70c21`) Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-08-24 13:00:53 -07:00
Diego Biurrun	d04fb11868	error_resilience: Drop asserts from guess_mv() The asserts check struct members that are not referenced in guess_mv() and one of them fails to compile. (cherry picked from commit `7cb66ebc0b`) Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-08-24 13:00:53 -07:00
Diego Biurrun	e8f2823f06	vsrc_movie: Adjust a silly typo from `b977b287f6` (cherry picked from commit `11cd727fbd`) Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-08-24 13:00:53 -07:00
Anton Khirnov	7dfccac20c	electronicarts: do not fail on zero-sized chunks At least one FATE sample contains such chunks and happens to work simply by accident (due to find_stream_info() swallowing the error). CC: libav-stable@libav.org (cherry picked from commit `4d6c515284`) Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-22 11:25:40 +00:00
Andrew Stone	04361427e6	Revert "lavf: eliminate ff_get_audio_frame_size()" This reverts commit `30e50c5027`. The original commit broke the ability to stream AAC over HTTP/Icecast. It looks like avformat_find_stream_info() gets stuck in an infinite loop, never hitting AVFormatContext.max_analyze_duration since duration is never set for any of the packets. Example stream: http://listen.classicrocklounge.com:8000/aac64 Signed-off-by: Anton Khirnov <anton@khirnov.net>	2014-08-22 11:22:38 +00:00
 @ -1 +1 @@
 .3.git
 .4