[FFmpeg-cvslog] r23661 - trunk/libavcodec/ps.c

[alexc]

Author: alexc
Date: Sun Jun 20 21:38:08 2010
New Revision: 23661

Log:
Allow PS envelope fixup when ps->num_env_old <= 1.

It is already rejected by the "source >= 0 && source != ps->num_env" 0 envelope
case and is perfectly legally for the suppressed final envelope case.

Modified:
   trunk/libavcodec/ps.c

Modified: trunk/libavcodec/ps.c
==============================================================================
--- trunk/libavcodec/ps.c	Sun Jun 20 21:24:18 2010	(r23660)
+++ trunk/libavcodec/ps.c	Sun Jun 20 21:38:08 2010	(r23661)
@@ -235,13 +235,13 @@ int ff_ps_read_data(AVCodecContext *avct
         //Create a fake envelope
         int source = ps->num_env ? ps->num_env - 1 : ps->num_env_old - 1;
         if (source >= 0 && source != ps->num_env) {
-            if (ps->enable_iid && ps->num_env_old > 1) {
+            if (ps->enable_iid) {
                 memcpy(ps->iid_par+ps->num_env, ps->iid_par+source, sizeof(ps->iid_par[0]));
             }
-            if (ps->enable_icc && ps->num_env_old > 1) {
+            if (ps->enable_icc) {
                 memcpy(ps->icc_par+ps->num_env, ps->icc_par+source, sizeof(ps->icc_par[0]));
             }
-            if (ps->enable_ipdopd && ps->num_env_old > 1) {
+            if (ps->enable_ipdopd) {
                 memcpy(ps->ipd_par+ps->num_env, ps->ipd_par+source, sizeof(ps->ipd_par[0]));
                 memcpy(ps->opd_par+ps->num_env, ps->opd_par+source, sizeof(ps->opd_par[0]));
             }