[FFmpeg-cvslog] Fix ffmpeg -codecs output.

Carl Eugen Hoyos git at videolan.org
Sat Feb 25 20:32:44 CET 2012


ffmpeg | branch: refs/remotes/origin/release/0.10 | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Feb 17 23:51:22 2012 +0100| [569cb94869ba26ced9860350883fc0f1c4afa2d2] | committer: Carl Eugen Hoyos

Fix ffmpeg -codecs output.
(cherry picked from commit f6492476a63938cc66c51bf61c88407b7749f780)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=569cb94869ba26ced9860350883fc0f1c4afa2d2
---

 cmdutils.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cmdutils.c b/cmdutils.c
index 386db3d..f326b9c 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -806,7 +806,7 @@ int opt_codecs(const char *opt, const char *arg)
             if (p2 && strcmp(p->name, p2->name) == 0) {
                 if (p->decode)
                     decode = 1;
-                if (p->encode)
+                if (p->encode || p->encode2)
                     encode = 1;
                 cap |= p->capabilities;
             }



More information about the ffmpeg-cvslog mailing list