Mercurial > libavformat.hg

changeset 1272:943d9957b96a libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move amr parameters adjusting like other codecs
author bcoudurier
date Thu, 24 Aug 2006 09:53:53 +0000
parents 8c80d41a11cc
children 07137c477f09
files mov.c
diffstat 1 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mov.c	Thu Aug 24 09:09:20 2006 +0000
+++ b/mov.c	Thu Aug 24 09:53:53 2006 +0000
@@ -978,14 +978,6 @@
                 if (st->codec->bits_per_sample == 8)
                     st->codec->codec_id = CODEC_ID_PCM_S8;
                 break;
-            case CODEC_ID_AMR_WB:
-                st->codec->sample_rate = 16000; /* should really we ? */
-                st->codec->channels=1; /* really needed */
-                break;
-            case CODEC_ID_AMR_NB:
-                st->codec->sample_rate = 8000; /* should really we ? */
-                st->codec->channels=1; /* really needed */
-                break;
             default:
                 break;
             }
@@ -1064,6 +1056,15 @@
         st->codec->codec_id = CODEC_ID_PCM_S16LE;
         break;
 #endif
+    /* no ifdef since parameters are always those */
+    case CODEC_ID_AMR_WB:
+        st->codec->sample_rate= 16000;
+        st->codec->channels= 1; /* really needed */
+        break;
+    case CODEC_ID_AMR_NB:
+        st->codec->sample_rate= 8000;
+        st->codec->channels= 1; /* really needed */
+        break;
     default:
         break;
     }