[FFmpeg-cvslog] pcmenc: remove unneeded sample_fmt check.

Justin Ruggles git at videolan.org
Thu Oct 27 01:46:44 CEST 2011


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Tue Sep 27 19:52:50 2011 -0400| [06af335a33a771bad05dc1873c3f9d8e84abfb45] | committer: Justin Ruggles

pcmenc: remove unneeded sample_fmt check.

It is already checked by avcodec_open2().

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

 libavcodec/pcm.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index 2a50a81..e7cf874 100644
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -95,11 +95,6 @@ static int pcm_encode_frame(AVCodecContext *avctx,
     samples = data;
     dst = frame;
 
-    if (avctx->sample_fmt!=avctx->codec->sample_fmts[0]) {
-        av_log(avctx, AV_LOG_ERROR, "invalid sample_fmt\n");
-        return -1;
-    }
-
     switch(avctx->codec->id) {
     case CODEC_ID_PCM_U32LE:
         ENCODE(uint32_t, le32, samples, dst, n, 0, 0x80000000)



More information about the ffmpeg-cvslog mailing list