[FFmpeg-cvslog] avcodec/svq1dec: remove unneeded #include, there are no assert()
ffmpeg | branch: master | Paul B Mahol | Fri Jan 30 10:51:10 2015 +| [335c150ba1d22786aa8d6e1a26192d75108d63e5] | committer: Paul B Mahol avcodec/svq1dec: remove unneeded #include, there are no assert() Signed-off-by: Paul B Mahol > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=335c150ba1d22786aa8d6e1a26192d75108d63e5 --- libavcodec/svq1dec.c |3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 2f9ea16..7c31e57 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -40,9 +40,6 @@ #include "mathops.h" #include "svq1.h" -#undef NDEBUG -#include - static VLC svq1_block_type; static VLC svq1_motion_component; static VLC svq1_intra_multistage[6]; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/mpeg: remove unneeded #include, there are no assert() only av_assert*
ffmpeg | branch: master | Paul B Mahol | Fri Jan 30 11:19:39 2015 +| [ca8617a04d32bec50b24c243ef95d2b6e0d7fcdd] | committer: Paul B Mahol avformat/mpeg: remove unneeded #include, there are no assert() only av_assert* Signed-off-by: Paul B Mahol > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca8617a04d32bec50b24c243ef95d2b6e0d7fcdd --- libavformat/mpeg.c |2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index f98d850..a0b5738 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -28,8 +28,6 @@ # include "libavutil/bprint.h" #endif -#undef NDEBUG -#include #include "libavutil/avassert.h" /*/ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/asfenc: remove unneeded #include, there are no assert() only av_assert*
ffmpeg | branch: master | Paul B Mahol | Fri Jan 30 11:21:10 2015 +| [12c5addebc66deb02007cdfe02af7ad753250e36] | committer: Paul B Mahol avformat/asfenc: remove unneeded #include, there are no assert() only av_assert* Signed-off-by: Paul B Mahol > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12c5addebc66deb02007cdfe02af7ad753250e36 --- libavformat/asfenc.c |4 1 file changed, 4 deletions(-) diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 3dc58f3..13bd5af 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -28,10 +28,6 @@ #include "riff.h" #include "asf.h" -#undef NDEBUG -#include - - #define ASF_INDEXED_INTERVAL1000 #define ASF_INDEX_BLOCK (1<<9) #define ASF_PAYLOADS_PER_PACKET 63 ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/vc1: remove unneeded #includes, there are no assert() only av_assert*
ffmpeg | branch: master | Paul B Mahol | Fri Jan 30 10:52:19 2015 +| [bc74f946bc9499c9eec52e54ee7a6c887ff54003] | committer: Paul B Mahol avcodec/vc1: remove unneeded #includes, there are no assert() only av_assert* Signed-off-by: Paul B Mahol > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc74f946bc9499c9eec52e54ee7a6c887ff54003 --- libavcodec/vc1.c |3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index b3955f2..19657ed 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -37,9 +37,6 @@ #include "unary.h" #include "simple_idct.h" -#undef NDEBUG -#include - /***/ /** * @name VC-1 Bitplane decoding ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/utils: remove unneeded #include, there are no assert() only av_assert*
ffmpeg | branch: master | Paul B Mahol | Fri Jan 30 11:17:50 2015 +| [43630c82f1b0a774ba33b07e7723791520828f1d] | committer: Paul B Mahol avformat/utils: remove unneeded #include, there are no assert() only av_assert* Signed-off-by: Paul B Mahol > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43630c82f1b0a774ba33b07e7723791520828f1d --- libavformat/utils.c |2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index f6df49b..81c7a0d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#undef NDEBUG -#include #include #include ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/mux: remove unneeded #include, there are no assert() only av_assert*
ffmpeg | branch: master | Paul B Mahol | Fri Jan 30 11:23:27 2015 +| [41456c7d159d83f2fe3ed9399da075b949033bc2] | committer: Paul B Mahol avformat/mux: remove unneeded #include, there are no assert() only av_assert* Signed-off-by: Paul B Mahol > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=41456c7d159d83f2fe3ed9399da075b949033bc2 --- libavformat/mux.c |3 --- 1 file changed, 3 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index adf8171..050c4d9 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -44,9 +44,6 @@ #include "network.h" #endif -#undef NDEBUG -#include - /** * @file * muxing functions for use within libavformat ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/mov: remove unneeded #include, there are no assert()
ffmpeg | branch: master | Paul B Mahol | Fri Jan 30 11:25:18
2015 +| [cc1357a173133e4ef81d9536d4475af93c9a15bd] | committer: Paul B Mahol
avformat/mov: remove unneeded #include, there are no assert()
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc1357a173133e4ef81d9536d4475af93c9a15bd
---
libavformat/mov.c |4
1 file changed, 4 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index f7e6137..91356ad 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -55,10 +55,6 @@
#include "qtpalette.h"
-
-#undef NDEBUG
-#include
-
/* those functions parse an atom */
/* links atom IDs to parse functions */
typedef struct MOVParseTableEntry {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/movenc: remove unneeded #include, there are no assert() only av_assert*
ffmpeg | branch: master | Paul B Mahol | Fri Jan 30 11:26:25
2015 +| [f705b1287bbdc312a3d69cae38ee1e8b00ab5618] | committer: Paul B Mahol
avformat/movenc: remove unneeded #include, there are no assert() only av_assert*
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f705b1287bbdc312a3d69cae38ee1e8b00ab5618
---
libavformat/movenc.c |3 ---
1 file changed, 3 deletions(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index d7ae5f0..3af3a17 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -48,9 +48,6 @@
#include "rtpenc.h"
#include "mov_chan.h"
-#undef NDEBUG
-#include
-
static const AVOption options[] = {
{ "movflags", "MOV muxer flags", offsetof(MOVMuxContext, flags),
AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM,
"movflags" },
{ "rtphint", "Add RTP hint tracks", 0, AV_OPT_TYPE_CONST, {.i64 =
FF_MOV_FLAG_RTP_HINT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags"
},
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavd/libcdio: add more paranoia mode constants
ffmpeg | branch: master | Stefano Sabatini | Fri Jan 30
18:30:17 2015 +0100| [c8bec255eff3f1f612cfa39c871bdb0c3585a340] | committer:
Stefano Sabatini
lavd/libcdio: add more paranoia mode constants
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8bec255eff3f1f612cfa39c871bdb0c3585a340
---
libavdevice/libcdio.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c
index 8bb95e6..9e9b0d8 100644
--- a/libavdevice/libcdio.c
+++ b/libavdevice/libcdio.c
@@ -165,10 +165,12 @@ static int read_seek(AVFormatContext *ctx, int
stream_index, int64_t timestamp,
#define DEC AV_OPT_FLAG_DECODING_PARAM
static const AVOption options[] = {
{ "speed", "set drive reading speed", OFFSET(speed),
AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, DEC },
-{ "paranoia_mode", "set error recovery mode", OFFSET(paranoia_mode),
AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, DEC, "paranoia_mode" },
+{ "paranoia_mode", "set error recovery mode", OFFSET(paranoia_mode),
AV_OPT_TYPE_FLAGS, { .i64 = PARANOIA_MODE_DISABLE }, INT_MIN, INT_MAX, DEC,
"paranoia_mode" },
+{ "disable","apply no fixups", 0,
AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_DISABLE }, 0, 0, DEC,
"paranoia_mode" },
{ "verify", "verify data integrity in overlap area", 0,
AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_VERIFY },0, 0, DEC,
"paranoia_mode" },
{ "overlap","perform overlapped reads", 0,
AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_OVERLAP }, 0, 0, DEC,
"paranoia_mode" },
{ "neverskip", "do not skip failed reads", 0,
AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_NEVERSKIP }, 0, 0, DEC,
"paranoia_mode" },
+{ "full", "apply all recovery modes", 0,
AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_FULL }, 0, 0, DEC,
"paranoia_mode" },
{ NULL },
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavd/libcdio: apply minor fixes to options documentation
ffmpeg | branch: master | Stefano Sabatini | Fri Jan 30
18:16:07 2015 +0100| [fbccbd68325a95de71455d087faf147690e5b988] | committer:
Stefano Sabatini
lavd/libcdio: apply minor fixes to options documentation
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbccbd68325a95de71455d087faf147690e5b988
---
libavdevice/libcdio.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c
index 16a4b26..8bb95e6 100644
--- a/libavdevice/libcdio.c
+++ b/libavdevice/libcdio.c
@@ -164,11 +164,11 @@ static int read_seek(AVFormatContext *ctx, int
stream_index, int64_t timestamp,
#define OFFSET(x) offsetof(CDIOContext, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM
static const AVOption options[] = {
-{ "speed", "Drive reading speed.", OFFSET(speed),
AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, DEC },
-{ "paranoia_mode", "Error recovery mode.", OFFSET(paranoia_mode),
AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, DEC, "paranoia_mode" },
-{ "verify", "Verify data integrity in overlap area", 0,
AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_VERIFY },0, 0, DEC,
"paranoia_mode" },
-{ "overlap","Perform overlapped reads.", 0,
AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_OVERLAP }, 0, 0, DEC,
"paranoia_mode" },
-{ "neverskip", "Do not skip failed reads.", 0,
AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_NEVERSKIP }, 0, 0, DEC,
"paranoia_mode" },
+{ "speed", "set drive reading speed", OFFSET(speed),
AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, DEC },
+{ "paranoia_mode", "set error recovery mode", OFFSET(paranoia_mode),
AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, DEC, "paranoia_mode" },
+{ "verify", "verify data integrity in overlap area", 0,
AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_VERIFY },0, 0, DEC,
"paranoia_mode" },
+{ "overlap","perform overlapped reads", 0,
AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_OVERLAP }, 0, 0, DEC,
"paranoia_mode" },
+{ "neverskip", "do not skip failed reads", 0,
AV_OPT_TYPE_CONST, { .i64 = PARANOIA_MODE_NEVERSKIP }, 0, 0, DEC,
"paranoia_mode" },
{ NULL },
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] doc/indevs/libcdio: apply minor spell fixes, extend documentation
ffmpeg | branch: master | Stefano Sabatini | Wed Jan 21
20:10:45 2015 +0100| [f422f474dfa7e9f54197dde961e4a01cd060994f] | committer:
Stefano Sabatini
doc/indevs/libcdio: apply minor spell fixes, extend documentation
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f422f474dfa7e9f54197dde961e4a01cd060994f
---
doc/indevs.texi | 33 ++---
1 file changed, 30 insertions(+), 3 deletions(-)
diff --git a/doc/indevs.texi b/doc/indevs.texi
index bd09f3f..f4a5779 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -627,20 +627,47 @@ ffmpeg -f lavfi -i "movie=test.ts[out0+subcc]" -map v
frame%08d.png -map s -c co
@section libcdio
-Audio-CD input device based on cdio.
+Audio-CD input device based on libcdio.
To enable this input device during configuration you need libcdio
-installed on your system. Requires the configure option
+installed on your system. It requires the configure option
@code{--enable-libcdio}.
This device allows playing and grabbing from an Audio-CD.
-For example to copy with @command{ffmpeg} the entire Audio-CD in /dev/sr0,
+For example to copy with @command{ffmpeg} the entire Audio-CD in
@file{/dev/sr0},
you may run the command:
@example
ffmpeg -f libcdio -i /dev/sr0 cd.wav
@end example
+@subsection Options
+@table @option
+@item speed
+Set drive reading speed. Default value is 0.
+
+The speed is specified CD-ROM speed units. The speed is set through
+the libcdio @code{cdio_cddap_speed_set} function. On many CD-ROM
+drives, specifying a value too large will result in using the fastest
+speed.
+
+@item paranoia_mode
+Set paranoia recovery mode flags. It accepts one of the following values:
+
+@table @samp
+@item disable
+@item verify
+@item overlap
+@item neverskip
+@item full
+@end table
+
+Default value is @samp{disable}.
+
+For more information about the available recovery modes, consult the
+paranoia project documentation.
+@end table
+
@section libdc1394
IIDC1394 input device, based on libdc1394 and libraw1394.
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] remove libmpcodecs
ffmpeg | branch: master | Paul B Mahol | Tue Jan 27 11:21:50
2015 +| [e7e0005cc6c784aabcd809fc9a8e1987e3b6dcb0] | committer: Paul B Mahol
remove libmpcodecs
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7e0005cc6c784aabcd809fc9a8e1987e3b6dcb0
---
Changelog |1 +
LICENSE.md |2 -
configure |1 -
doc/filters.texi | 29 ---
libavfilter/Makefile |4 -
libavfilter/allfilters.c |1 -
libavfilter/libmpcodecs/cpudetect.h| 60 --
libavfilter/libmpcodecs/img_format.c | 244 --
libavfilter/libmpcodecs/img_format.h | 309
libavfilter/libmpcodecs/libvo/fastmemcpy.h | 99 -
libavfilter/libmpcodecs/mp_image.c | 257 ---
libavfilter/libmpcodecs/mp_image.h | 159 --
libavfilter/libmpcodecs/mp_msg.h | 166 ---
libavfilter/libmpcodecs/vf.h | 167 ---
libavfilter/libmpcodecs/vfcap.h| 56 -
libavfilter/version.h |2 +-
16 files changed, 2 insertions(+), 1555 deletions(-)
diff --git a/Changelog b/Changelog
index 135cd65..8e55969 100644
--- a/Changelog
+++ b/Changelog
@@ -18,6 +18,7 @@ version :
- showpalette filter
- Twofish symmetric block cipher
- Support DNx100 (960x720@8)
+- removed libmpcodecs
version 2.5:
diff --git a/LICENSE.md b/LICENSE.md
index fb52cad..915575e 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -13,7 +13,6 @@ configure to activate them. In this case, FFmpeg's license
changes to GPL v2+.
Specifically, the GPL parts of FFmpeg are:
- libpostproc
-- libmpcodecs
- optional x86 optimizations in the files
libavcodec/x86/flac_dsp_gpl.asm
libavcodec/x86/idct_mmx.c
@@ -38,7 +37,6 @@ Specifically, the GPL parts of FFmpeg are:
- vf_interlace.c
- vf_kerndeint.c
- vf_mcdeint.c
-- vf_mp.c
- vf_mpdecimate.c
- vf_owdenoise.c
- vf_perspective.c
diff --git a/configure b/configure
index 80985cb..4e38073 100755
--- a/configure
+++ b/configure
@@ -2597,7 +2597,6 @@ kerndeint_filter_deps="gpl"
ladspa_filter_deps="ladspa dlopen"
mcdeint_filter_deps="avcodec gpl"
movie_filter_deps="avcodec avformat"
-mp_filter_deps="gpl avcodec swscale"
mpdecimate_filter_deps="gpl"
mpdecimate_filter_select="pixelutils"
mptestsrc_filter_deps="gpl"
diff --git a/doc/filters.texi b/doc/filters.texi
index 26f8ff9..c6fef0c 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -6263,35 +6263,6 @@ Higher values should result in a smoother motion vector
field but less
optimal individual vectors. Default value is 1.
@end table
-@section mp
-
-Apply an MPlayer filter to the input video.
-
-This filter provides a wrapper around some of the filters of
-MPlayer/MEncoder.
-
-This wrapper is considered experimental. Some of the wrapped filters
-may not work properly and we may drop support for them, as they will
-be implemented natively into FFmpeg. Thus you should avoid
-depending on them when writing portable scripts.
-
-The filter accepts the parameters:
-@var{filter_name}[:=]@var{filter_params}
-
-@var{filter_name} is the name of a supported MPlayer filter,
-@var{filter_params} is a string containing the parameters accepted by
-the named filter.
-
-The list of the currently supported filters follows:
-@table @var
-@end table
-
-The parameter syntax and behavior for the listed filters are the same
-of the corresponding MPlayer filters. For detailed instructions check
-the "VIDEO FILTERS" section in the MPlayer manual.
-
-See also mplayer(1), @url{http://www.mplayerhq.hu/}.
-
@section mpdecimate
Drop frames that do not differ greatly from the previous frame in
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 69fbb60..75d19dc 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -149,7 +149,6 @@ OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o
OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o
OBJS-$(CONFIG_MCDEINT_FILTER)+= vf_mcdeint.o
OBJS-$(CONFIG_MERGEPLANES_FILTER)+= vf_mergeplanes.o framesync.o
-OBJS-$(CONFIG_MP_FILTER) += vf_mp.o
OBJS-$(CONFIG_MPDECIMATE_FILTER) += vf_mpdecimate.o
OBJS-$(CONFIG_NEGATE_FILTER) += vf_lut.o
OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o
@@ -226,9 +225,6 @@ OBJS-$(CONFIG_TESTSRC_FILTER)+=
vsrc_testsrc.o
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/mp_image.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/img_format.o
-
# multimedia filters
OBJS-$(CONFIG_AVECTORSCOPE_FILTER) += avf_avectorscope.o
OBJS-$(CONFIG_CONCAT_FILTER) += avf_concat.o
diff --git a/libavfil
[FFmpeg-cvslog] avfilter: remove vf_mp.c
ffmpeg | branch: master | Paul B Mahol | Sat Jan 31 12:43:03
2015 +| [a34f4e2fd2e0e82e66559a45906a09e6e7efbd7e] | committer: Paul B Mahol
avfilter: remove vf_mp.c
Signed-off-by: Paul B Mahol
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a34f4e2fd2e0e82e66559a45906a09e6e7efbd7e
---
libavfilter/vf_mp.c | 769 ---
1 file changed, 769 deletions(-)
diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c
deleted file mode 100644
index 59bd60d..000
--- a/libavfilter/vf_mp.c
+++ /dev/null
@@ -1,769 +0,0 @@
-/*
- * Copyright (c) 2011 Michael Niedermayer
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Parts of this file have been stolen from mplayer
- */
-
-/**
- * @file
- */
-
-#include "avfilter.h"
-#include "video.h"
-#include "formats.h"
-#include "internal.h"
-#include "libavutil/avassert.h"
-#include "libavutil/pixdesc.h"
-#include "libavutil/intreadwrite.h"
-#include "libavutil/imgutils.h"
-#include "libavutil/opt.h"
-
-#include "libmpcodecs/vf.h"
-#include "libmpcodecs/img_format.h"
-#include "libmpcodecs/cpudetect.h"
-#include "libmpcodecs/libvo/fastmemcpy.h"
-
-#include "libswscale/swscale.h"
-
-
-//FIXME maybe link the orig in
-//XXX: identical pix_fmt must be following with each others
-static const struct {
-int fmt;
-enum AVPixelFormat pix_fmt;
-} conversion_map[] = {
-{IMGFMT_ARGB, AV_PIX_FMT_ARGB},
-{IMGFMT_BGRA, AV_PIX_FMT_BGRA},
-{IMGFMT_BGR24, AV_PIX_FMT_BGR24},
-{IMGFMT_BGR16BE, AV_PIX_FMT_RGB565BE},
-{IMGFMT_BGR16LE, AV_PIX_FMT_RGB565LE},
-{IMGFMT_BGR15BE, AV_PIX_FMT_RGB555BE},
-{IMGFMT_BGR15LE, AV_PIX_FMT_RGB555LE},
-{IMGFMT_BGR12BE, AV_PIX_FMT_RGB444BE},
-{IMGFMT_BGR12LE, AV_PIX_FMT_RGB444LE},
-{IMGFMT_BGR8, AV_PIX_FMT_RGB8},
-{IMGFMT_BGR4, AV_PIX_FMT_RGB4},
-{IMGFMT_BGR1, AV_PIX_FMT_MONOBLACK},
-{IMGFMT_RGB1, AV_PIX_FMT_MONOBLACK},
-{IMGFMT_RG4B, AV_PIX_FMT_BGR4_BYTE},
-{IMGFMT_BG4B, AV_PIX_FMT_RGB4_BYTE},
-{IMGFMT_RGB48LE, AV_PIX_FMT_RGB48LE},
-{IMGFMT_RGB48BE, AV_PIX_FMT_RGB48BE},
-{IMGFMT_ABGR, AV_PIX_FMT_ABGR},
-{IMGFMT_RGBA, AV_PIX_FMT_RGBA},
-{IMGFMT_RGB24, AV_PIX_FMT_RGB24},
-{IMGFMT_RGB16BE, AV_PIX_FMT_BGR565BE},
-{IMGFMT_RGB16LE, AV_PIX_FMT_BGR565LE},
-{IMGFMT_RGB15BE, AV_PIX_FMT_BGR555BE},
-{IMGFMT_RGB15LE, AV_PIX_FMT_BGR555LE},
-{IMGFMT_RGB12BE, AV_PIX_FMT_BGR444BE},
-{IMGFMT_RGB12LE, AV_PIX_FMT_BGR444LE},
-{IMGFMT_RGB8, AV_PIX_FMT_BGR8},
-{IMGFMT_RGB4, AV_PIX_FMT_BGR4},
-{IMGFMT_BGR8, AV_PIX_FMT_PAL8},
-{IMGFMT_YUY2, AV_PIX_FMT_YUYV422},
-{IMGFMT_UYVY, AV_PIX_FMT_UYVY422},
-{IMGFMT_NV12, AV_PIX_FMT_NV12},
-{IMGFMT_NV21, AV_PIX_FMT_NV21},
-{IMGFMT_Y800, AV_PIX_FMT_GRAY8},
-{IMGFMT_Y8,AV_PIX_FMT_GRAY8},
-{IMGFMT_YVU9, AV_PIX_FMT_YUV410P},
-{IMGFMT_IF09, AV_PIX_FMT_YUV410P},
-{IMGFMT_YV12, AV_PIX_FMT_YUV420P},
-{IMGFMT_I420, AV_PIX_FMT_YUV420P},
-{IMGFMT_IYUV, AV_PIX_FMT_YUV420P},
-{IMGFMT_411P, AV_PIX_FMT_YUV411P},
-{IMGFMT_422P, AV_PIX_FMT_YUV422P},
-{IMGFMT_444P, AV_PIX_FMT_YUV444P},
-{IMGFMT_440P, AV_PIX_FMT_YUV440P},
-
-{IMGFMT_420A, AV_PIX_FMT_YUVA420P},
-
-{IMGFMT_420P16_LE, AV_PIX_FMT_YUV420P16LE},
-{IMGFMT_420P16_BE, AV_PIX_FMT_YUV420P16BE},
-{IMGFMT_422P16_LE, AV_PIX_FMT_YUV422P16LE},
-{IMGFMT_422P16_BE, AV_PIX_FMT_YUV422P16BE},
-{IMGFMT_444P16_LE, AV_PIX_FMT_YUV444P16LE},
-{IMGFMT_444P16_BE, AV_PIX_FMT_YUV444P16BE},
-
-// YUVJ are YUV formats that use the full Y range and not just
-// 16 - 235 (see colorspaces.txt).
-// Currently they are all treated the same way.
-{IMGFMT_YV12, AV_PIX_FMT_YUVJ420P},
-{IMGFMT_422P, AV_PIX_FMT_YUVJ422P},
-{IMGFMT_444P, AV_PIX_FMT_YUVJ444P},
-{IMGFMT_440P, AV_PIX_FMT_YUVJ440P},
-
-#if FF_API_XVMC
-{IMGFMT_XVMC_MOCO_MPEG2, AV_PIX_FMT_XVMC_MPEG2_MC},
-{IMGFMT_XVMC_IDCT_MPEG2, AV_PIX_FMT_XVMC_MPEG2_IDCT},
-#endif /* FF_API_XVMC */
-
-{IMGFMT_VDPAU_MPEG1, AV_PIX_FMT_VDPAU_MPEG1},
-{IMGFMT_VDPAU_MPEG2, AV_PIX_FMT_VDPAU_MPEG2},
-{IMGFMT_VDPAU_H264, AV_PIX_FMT_VDPAU_H264},
-{IMGFMT_VDPAU_WMV3, AV_PIX_FMT_VDPAU_WMV3},
-{IMGFMT_VDPAU_VC1, AV_PIX_FMT_V
[FFmpeg-cvslog] avfilter/avfilter: Remove CONFIG_MP_FILTER case
ffmpeg | branch: master | Michael Niedermayer | Sat Jan 31
13:39:45 2015 +0100| [b288f67434db57f3e3c70c59651b4b1ba2e833e2] | committer:
Michael Niedermayer
avfilter/avfilter: Remove CONFIG_MP_FILTER case
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b288f67434db57f3e3c70c59651b4b1ba2e833e2
---
libavfilter/avfilter.c | 15 ---
1 file changed, 15 deletions(-)
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 76c60c1..1b5cc2f 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -965,21 +965,6 @@ int avfilter_init_str(AVFilterContext *filter, const char
*args)
goto fail;
#endif
} else {
-#if CONFIG_MP_FILTER
-if (!strcmp(filter->filter->name, "mp")) {
-char *escaped;
-
-if (!strncmp(args, "filter=", 7))
-args += 7;
-ret = av_escape(&escaped, args, ":=",
AV_ESCAPE_MODE_BACKSLASH, 0);
-if (ret < 0) {
-av_log(filter, AV_LOG_ERROR, "Unable to escape MPlayer
filters arg '%s'\n", args);
-goto fail;
-}
-ret = process_options(filter, &options, escaped);
-av_free(escaped);
-} else
-#endif
ret = process_options(filter, &options, args);
if (ret < 0)
goto fail;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] configure: remove mp_filter leftover
ffmpeg | branch: master | Paul B Mahol | Sat Jan 31 12:56:47 2015 +| [b47ab04c40ab771bc8e96a0756821515cc2fbac4] | committer: Paul B Mahol configure: remove mp_filter leftover Pointed out by: ubitux Signed-off-by: Paul B Mahol > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b47ab04c40ab771bc8e96a0756821515cc2fbac4 --- configure |1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 4e38073..6c61f2a 100755 --- a/configure +++ b/configure @@ -5423,7 +5423,6 @@ enabled ebur128_filter && enabled swresample && prepend avfilter_deps "swresampl enabled elbg_filter && prepend avfilter_deps "avcodec" enabled mcdeint_filter && prepend avfilter_deps "avcodec" enabled movie_filter&& prepend avfilter_deps "avformat avcodec" -enabled mp_filter && prepend avfilter_deps "avcodec" enabled pan_filter && prepend avfilter_deps "swresample" enabled pp_filter && prepend avfilter_deps "postproc" enabled removelogo_filter && prepend avfilter_deps "avformat avcodec swscale" ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2.
ffmpeg | branch: master | Carl Eugen Hoyos | Sat Jan 31 10:01:37 2015 +0100| [4faea46bd906b3897018736208123aa36c3f45d5] | committer: Carl Eugen Hoyos lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4faea46bd906b3897018736208123aa36c3f45d5 --- libavcodec/aarch64/h264dsp_init_aarch64.c |1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/aarch64/h264dsp_init_aarch64.c b/libavcodec/aarch64/h264dsp_init_aarch64.c index ed5e4bd..e0f378f 100644 --- a/libavcodec/aarch64/h264dsp_init_aarch64.c +++ b/libavcodec/aarch64/h264dsp_init_aarch64.c @@ -78,6 +78,7 @@ av_cold void ff_h264dsp_init_aarch64(H264DSPContext *c, const int bit_depth, c->h264_v_loop_filter_luma = ff_h264_v_loop_filter_luma_neon; c->h264_h_loop_filter_luma = ff_h264_h_loop_filter_luma_neon; c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon; +if (chroma_format_idc <= 1) c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon; c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16_neon; ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2.
ffmpeg | branch: master | Carl Eugen Hoyos | Sat Jan 31
10:05:24 2015 +0100| [f9f9ae1b77e4fb1bffa6b23be7bd20e514b8ba7b] | committer:
Carl Eugen Hoyos
lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9f9ae1b77e4fb1bffa6b23be7bd20e514b8ba7b
---
libavcodec/arm/h264dsp_init_arm.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/arm/h264dsp_init_arm.c
b/libavcodec/arm/h264dsp_init_arm.c
index 88dfd75..90144d0 100644
--- a/libavcodec/arm/h264dsp_init_arm.c
+++ b/libavcodec/arm/h264dsp_init_arm.c
@@ -76,8 +76,8 @@ static av_cold void h264dsp_init_neon(H264DSPContext *c,
const int bit_depth,
if (bit_depth == 8) {
c->h264_v_loop_filter_luma = ff_h264_v_loop_filter_luma_neon;
c->h264_h_loop_filter_luma = ff_h264_h_loop_filter_luma_neon;
-if(chroma_format_idc == 1){
c->h264_v_loop_filter_chroma = ff_h264_v_loop_filter_chroma_neon;
+if(chroma_format_idc == 1){
c->h264_h_loop_filter_chroma = ff_h264_h_loop_filter_chroma_neon;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'
ffmpeg | branch: master | Michael Niedermayer | Sat Jan 31 14:29:11 2015 +0100| [958836f8c5197ee32133a0ca7d35bcbb50358379] | committer: Michael Niedermayer Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2. lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2. Merged-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=958836f8c5197ee32133a0ca7d35bcbb50358379 --- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/cache: pass options to the underlying protocol via the url_open2
ffmpeg | branch: master | Zhang Rui | Sat Jan 31 13:35:04
2015 +0800| [ca2e3e47fc6f755e5614e33dc0e654b8137fc16f] | committer: Michael
Niedermayer
avformat/cache: pass options to the underlying protocol via the url_open2
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca2e3e47fc6f755e5614e33dc0e654b8137fc16f
---
libavformat/cache.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/cache.c b/libavformat/cache.c
index 02b02bb..26e68c5 100644
--- a/libavformat/cache.c
+++ b/libavformat/cache.c
@@ -70,7 +70,7 @@ static int cmp(void *key, const void *node)
return (*(int64_t *) key) - ((const CacheEntry *) node)->logical_pos;
}
-static int cache_open(URLContext *h, const char *arg, int flags)
+static int cache_open(URLContext *h, const char *arg, int flags, AVDictionary
**options)
{
char *buffername;
Context *c= h->priv_data;
@@ -86,7 +86,7 @@ static int cache_open(URLContext *h, const char *arg, int
flags)
unlink(buffername);
av_freep(&buffername);
-return ffurl_open(&c->inner, arg, flags, &h->interrupt_callback, NULL);
+return ffurl_open(&c->inner, arg, flags, &h->interrupt_callback, options);
}
static int add_entry(URLContext *h, const unsigned char *buf, int size)
@@ -313,7 +313,7 @@ static const AVClass cache_context_class = {
URLProtocol ff_cache_protocol = {
.name= "cache",
-.url_open= cache_open,
+.url_open2 = cache_open,
.url_read= cache_read,
.url_seek= cache_seek,
.url_close = cache_close,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/h261enc: More specific return code
ffmpeg | branch: master | Michael Niedermayer | Sat Jan 31 19:49:57 2015 +0100| [3aefa1eb69c48563302d1f8869d424283b66031d] | committer: Michael Niedermayer avcodec/h261enc: More specific return code Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3aefa1eb69c48563302d1f8869d424283b66031d --- libavcodec/h261enc.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 87eb94f..b888a36 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -46,7 +46,7 @@ int ff_h261_get_picture_format(int width, int height) return 1; // ERROR else -return -1; +return AVERROR(EINVAL); } void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/h261enc: Avoid casts, Simplify code
ffmpeg | branch: master | Michael Niedermayer | Sat Jan 31 19:49:28 2015 +0100| [b9c3f041e029ccb5c0462fb46eb8b95f69cd9a9c] | committer: Michael Niedermayer avcodec/h261enc: Avoid casts, Simplify code Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9c3f041e029ccb5c0462fb46eb8b95f69cd9a9c --- libavcodec/h261enc.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index d7b56a8..87eb94f 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -61,8 +61,8 @@ void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number) put_bits(&s->pb, 20, 0x10); /* PSC */ -temp_ref = s->picture_number * (int64_t)3 * s->avctx->time_base.num / - (1001 * (int64_t)s->avctx->time_base.den); // FIXME maybe this should use a timestamp +temp_ref = s->picture_number * 3L * s->avctx->time_base.num / + (1001L * s->avctx->time_base.den); // FIXME maybe this should use a timestamp put_sbits(&s->pb, 5, temp_ref); /* TemporalReference */ put_bits(&s->pb, 1, 0); /* split screen off */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
Re: [FFmpeg-cvslog] avcodec/h261enc: Avoid casts, Simplify code
On 31.01.2015, at 20:00, g...@videolan.org (Michael Niedermayer) wrote: > ffmpeg | branch: master | Michael Niedermayer | Sat Jan 31 > 19:49:28 2015 +0100| [b9c3f041e029ccb5c0462fb46eb8b95f69cd9a9c] | committer: > Michael Niedermayer > > avcodec/h261enc: Avoid casts, Simplify code > > Signed-off-by: Michael Niedermayer > >> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9c3f041e029ccb5c0462fb46eb8b95f69cd9a9c > --- > > libavcodec/h261enc.c |4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c > index d7b56a8..87eb94f 100644 > --- a/libavcodec/h261enc.c > +++ b/libavcodec/h261enc.c > @@ -61,8 +61,8 @@ void ff_h261_encode_picture_header(MpegEncContext *s, int > picture_number) > > put_bits(&s->pb, 20, 0x10); /* PSC */ > > -temp_ref = s->picture_number * (int64_t)3 * s->avctx->time_base.num / > - (1001 * (int64_t)s->avctx->time_base.den); // FIXME maybe > this should use a timestamp > +temp_ref = s->picture_number * 3L * s->avctx->time_base.num / > + (1001L * s->avctx->time_base.den); // FIXME maybe this > should use a timestamp > put_sbits(&s->pb, 5, temp_ref); /* TemporalReference */ Huh? These aren't the same, long is 32 bits on both 32 bit systems and Windows in general. Did you mean to use LL? ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avcodec/motion_est: Set subcmp consistently for H261
ffmpeg | branch: master | Michael Niedermayer | Sat Jan 31
21:14:08 2015 +0100| [b80106169ab16c31e27ea464ca62b805b205d61d] | committer:
Michael Niedermayer
avcodec/motion_est: Set subcmp consistently for H261
Fixes Ticket3150
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b80106169ab16c31e27ea464ca62b805b205d61d
---
libavcodec/motion_est.c |3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 901fafd..749af72 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -321,6 +321,9 @@ int ff_init_me(MpegEncContext *s){
c->avctx= s->avctx;
+if(s->codec_id == AV_CODEC_ID_H261)
+c->avctx->me_sub_cmp = c->avctx->me_cmp;
+
if(cache_size < 2*dia_size && !c->stride){
av_log(s->avctx, AV_LOG_INFO, "ME_MAP size may be a little small for
the selected diamond size\n");
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] examples/demuxing_decoding: set stream_idx in open_codec_context only if no error occured
ffmpeg | branch: master | Andreas Cadhalpun
| Sat Jan 31 21:11:38 2015 +0100| [2a3b7a55b51116c968fc32d4b6a2f7cc35e677f2] |
committer: Michael Niedermayer
examples/demuxing_decoding: set stream_idx in open_codec_context only if no
error occured
Signed-off-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a3b7a55b51116c968fc32d4b6a2f7cc35e677f2
---
doc/examples/demuxing_decoding.c |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/examples/demuxing_decoding.c b/doc/examples/demuxing_decoding.c
index 2ce4018..30bee1d 100644
--- a/doc/examples/demuxing_decoding.c
+++ b/doc/examples/demuxing_decoding.c
@@ -138,7 +138,7 @@ static int decode_packet(int *got_frame, int cached)
static int open_codec_context(int *stream_idx,
AVFormatContext *fmt_ctx, enum AVMediaType type)
{
-int ret;
+int ret, stream_index;
AVStream *st;
AVCodecContext *dec_ctx = NULL;
AVCodec *dec = NULL;
@@ -150,8 +150,8 @@ static int open_codec_context(int *stream_idx,
av_get_media_type_string(type), src_filename);
return ret;
} else {
-*stream_idx = ret;
-st = fmt_ctx->streams[*stream_idx];
+stream_index = ret;
+st = fmt_ctx->streams[stream_index];
/* find decoder for the stream */
dec_ctx = st->codec;
@@ -170,6 +170,7 @@ static int open_codec_context(int *stream_idx,
av_get_media_type_string(type));
return ret;
}
+*stream_idx = stream_index;
}
return 0;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] dvenc: fix 2x4x8 (interlaced) weight table
ffmpeg | branch: master | Christophe Gisquet |
Fri Jan 30 19:43:03 2015 +0100| [cb335b3af2022ada18cd89cd503ca270c54129ac] |
committer: Michael Niedermayer
dvenc: fix 2x4x8 (interlaced) weight table
Since the decoder has been fixed to output something similar to
other implementations, the encoder weight table needed this fix.
Reference PSNR values on a progressive sequence (from tiny_psnr)
from a chained encoding and decoding:
Full progressive: stddev:0.74 PSNR: 50.69 MAXDIFF: 19
Before: stddev:1.43 PSNR: 44.97 MAXDIFF: 17
This patch: stddev:0.76 PSNR: 50.44 MAXDIFF: 14
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb335b3af2022ada18cd89cd503ca270c54129ac
---
libavcodec/dvenc.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c
index 7061508..2442f2b 100644
--- a/libavcodec/dvenc.c
+++ b/libavcodec/dvenc.c
@@ -232,14 +232,14 @@ static const int dv_weight_88[64] = {
170627, 165371, 160727, 153560, 160727, 144651, 144651, 136258,
};
static const int dv_weight_248[64] = {
-131072, 242189, 257107, 237536, 229376, 200636, 242189, 223754,
-224969, 196781, 262144, 242189, 229376, 200636, 257107, 237536,
-211916, 185364, 235923, 217965, 229376, 211916, 206433, 180568,
-242189, 223754, 224969, 196781, 211916, 185364, 235923, 217965,
-200704, 175557, 222935, 205965, 200636, 185364, 195068, 170627,
-229376, 211916, 206433, 180568, 200704, 175557, 222935, 205965,
-175557, 153560, 188995, 174609, 165371, 144651, 200636, 185364,
-195068, 170627, 175557, 153560, 188995, 174609, 165371, 144651,
+131072, 262144, 257107, 257107, 242189, 242189, 242189, 242189,
+237536, 237536, 229376, 229376, 200636, 200636, 224973, 224973,
+223754, 223754, 235923, 235923, 229376, 229376, 217965, 217965,
+211916, 211916, 196781, 196781, 185364, 185364, 206433, 206433,
+211916, 211916, 222935, 222935, 200636, 200636, 205964, 205964,
+200704, 200704, 180568, 180568, 175557, 175557, 195068, 195068,
+185364, 185364, 188995, 188995, 174606, 174606, 175557, 175557,
+170627, 170627, 153560, 153560, 165371, 165371, 144651, 144651,
};
static av_always_inline int dv_init_enc_block(EncBlockInfo *bi, uint8_t *data,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
