r20429 - in trunk: libavcodec/smacker.c libavformat/smacker.c

Author: jbr
Date: Sun Nov  1 16:08:49 2009
New Revision: 20429

Log:
Set the sample format for Smacker audio in the decoder rather than in the 
demuxer.

Modified:
   trunk/libavcodec/smacker.c
   trunk/libavformat/smacker.c

Modified: trunk/libavcodec/smacker.c
==============================================================================
--- trunk/libavcodec/smacker.c	Sat Oct 31 17:33:38 2009	(r20428)
+++ trunk/libavcodec/smacker.c	Sun Nov  1 16:08:49 2009	(r20429)
 <at>  <at>  -555,6 +555,7  <at>  <at>  static av_cold int decode_end(AVCodecCon
 static av_cold int smka_decode_init(AVCodecContext *avctx)
 {
     avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
+    avctx->sample_fmt = avctx->bits_per_coded_sample == 8 ? SAMPLE_FMT_U8 : SAMPLE_FMT_S16;
     return 0;
 }

Modified: trunk/libavformat/smacker.c
==============================================================================
--- trunk/libavformat/smacker.c	Sat Oct 31 17:33:38 2009	(r20428)
+++ trunk/libavformat/smacker.c	Sun Nov  1 16:08:49 2009	(r20429)
 <at>  <at>  -183,7 +183,6  <at>  <at>  static int smacker_read_header(AVFormatC
             ast[i]->codec->bits_per_coded_sample = (smk->rates[i] & SMK_AUD_16BITS) ? 16 : 8;

r20430 - trunk/libavcodec/flacdec.c

Author: jbr
Date: Sun Nov  1 17:48:05 2009
New Revision: 20430

Log:
Set sample format in flac_decode_init() rather than in 
ff_flac_parse_streaminfo() since the latter is shared with the raw FLAC
demuxer, which should not be setting the sample format.

Modified:
   trunk/libavcodec/flacdec.c

Modified: trunk/libavcodec/flacdec.c
==============================================================================
--- trunk/libavcodec/flacdec.c	Sun Nov  1 16:08:49 2009	(r20429)
+++ trunk/libavcodec/flacdec.c	Sun Nov  1 17:48:05 2009	(r20430)
 <at>  <at>  -125,6 +125,10  <at>  <at>  static av_cold int flac_decode_init(AVCo

     /* initialize based on the demuxer-supplied streamdata header */
     ff_flac_parse_streaminfo(avctx, (FLACStreaminfo *)s, streaminfo);
+    if (s->bps > 16)
+        avctx->sample_fmt = SAMPLE_FMT_S32;
+    else
+        avctx->sample_fmt = SAMPLE_FMT_S16;
     allocate_buffers(s);
     s->got_streaminfo = 1;

 <at>  <at>  -186,10 +190,6  <at>  <at>  void ff_flac_parse_streaminfo(AVCodecCon
     avctx->channels = s->channels;
     avctx->sample_rate = s->samplerate;

r20431 - trunk/configure

Author: mru
Date: Sun Nov  1 21:14:56 2009
New Revision: 20431

Log:
configure: fix 64-bit test with clang

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Nov  1 17:48:05 2009	(r20430)
+++ trunk/configure	Sun Nov  1 21:14:56 2009	(r20431)
 <at>  <at>  -1862,7 +1862,7  <at>  <at>  case "$arch" in
         subarch="x86_32"
         enable fast_unaligned
         check_cc <<EOF && enable fast_64bit && subarch="x86_64" && spic=$shared
-        int test[sizeof(char*) - 7];
+        int test[(int)sizeof(char*) - 7];
 EOF
         if test "$subarch" = "x86_64"; then
             enable cmov

r20432 - in trunk: libavcodec/raw.c libavformat/riff.c

Author: compn
Date: Mon Nov  2 01:10:10 2009
New Revision: 20432

Log:
map VYUY fourcc to rawcodec
fixes http://samples.mplayerhq.hu/V-codecs/ATI-VCR12/ATI/y422test.avi

Modified:
   trunk/libavcodec/raw.c
   trunk/libavformat/riff.c

Modified: trunk/libavcodec/raw.c
==============================================================================
--- trunk/libavcodec/raw.c	Sun Nov  1 21:14:56 2009	(r20431)
+++ trunk/libavcodec/raw.c	Mon Nov  2 01:10:10 2009	(r20432)
 <at>  <at>  -43,6 +43,7  <at>  <at>  const PixelFormatTag ff_raw_pixelFormatT
     { PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */
     { PIX_FMT_YUYV422, MKTAG('Y', '4', '2', '2') },
     { PIX_FMT_YUYV422, MKTAG('V', '4', '2', '2') },
+    { PIX_FMT_YUYV422, MKTAG('V', 'Y', 'U', 'Y') },
     { PIX_FMT_YUYV422, MKTAG('Y', 'U', 'N', 'V') },
     { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'V', 'Y') },
     { PIX_FMT_UYVY422, MKTAG('H', 'D', 'Y', 'C') },

Modified: trunk/libavformat/riff.c
==============================================================================
--- trunk/libavformat/riff.c	Sun Nov  1 21:14:56 2009	(r20431)
+++ trunk/libavformat/riff.c	Mon Nov  2 01:10:10 2009	(r20432)
 <at>  <at>  -151,6 +151,7  <at>  <at>  const AVCodecTag ff_codec_bmp_tags[] = {

r20433 - in trunk/libavcodec: mjpegdec.c mjpegdec.h

Author: michael
Date: Mon Nov  2 15:12:25 2009
New Revision: 20433

Log:
Avoid huge array for rgb ljpeg on the stack.
Code tested with an ljpeg i had laying around.

Modified:
   trunk/libavcodec/mjpegdec.c
   trunk/libavcodec/mjpegdec.h

Modified: trunk/libavcodec/mjpegdec.c
==============================================================================
--- trunk/libavcodec/mjpegdec.c	Mon Nov  2 01:10:10 2009	(r20432)
+++ trunk/libavcodec/mjpegdec.c	Mon Nov  2 15:12:25 2009	(r20433)
 <at>  <at>  -616,13 +616,13  <at>  <at>  static int decode_block_refinement(MJpeg

 static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int predictor, int point_transform){
     int i, mb_x, mb_y;
-    uint16_t buffer[32768][4];
+    uint16_t (*buffer)[4];
     int left[3], top[3], topleft[3];
     const int linesize= s->linesize[0];
     const int mask= (1<<s->bits)-1;

-    if((unsigned)s->mb_width > 32768) //dynamic alloc
-        return -1;
+    av_fast_malloc(&s->ljpeg_buffer, &s->ljpeg_buffer_size, (unsigned)s->mb_width * 4 * sizeof(s->ljpeg_buffer[0][0]));
+    buffer= s->ljpeg_buffer;

r20434 - trunk/libavutil/pixdesc.c

Author: stefano
Date: Mon Nov  2 21:23:47 2009
New Revision: 20434

Log:
Add PIX_FMT_PAL flag to BGR8, BGR4_BYTE, RGB8, and RGB4_BYTE formats.

Modified:
   trunk/libavutil/pixdesc.c

Modified: trunk/libavutil/pixdesc.c
==============================================================================
--- trunk/libavutil/pixdesc.c	Mon Nov  2 15:12:25 2009	(r20433)
+++ trunk/libavutil/pixdesc.c	Mon Nov  2 21:23:47 2009	(r20434)
 <at>  <at>  -215,6 +215,7  <at>  <at>  const AVPixFmtDescriptor av_pix_fmt_desc
             {0,0,1,3,2},        /* G */
             {0,0,1,0,2},        /* R */
         },
+        .flags = PIX_FMT_PAL,
     },
     [PIX_FMT_BGR4] = {
         .name = "bgr4",
 <at>  <at>  -238,6 +239,7  <at>  <at>  const AVPixFmtDescriptor av_pix_fmt_desc
             {0,0,1,1,1},        /* G */
             {0,0,1,0,0},        /* R */
         },
+        .flags = PIX_FMT_PAL,
     },
     [PIX_FMT_RGB8] = {
         .name = "rgb8",

r20435 - trunk/ffmpeg.c

Author: ramiro
Date: Tue Nov  3 00:41:54 2009
New Revision: 20435

Log:
Add -fpre option to take a preset file as parameter. The -[avs]pre options no
longer accept filenames, and -fpre should be used instead.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Mon Nov  2 21:23:47 2009	(r20434)
+++ trunk/ffmpeg.c	Tue Nov  3 00:41:54 2009	(r20435)
 <at>  <at>  -3775,6 +3775,7  <at>  <at>  static int opt_preset(const char *opt, c
                            FFMPEG_DATADIR,
                          };

+    if (*opt != 'f') {
     for(i=!base[0]; i<2 && !f; i++){
         snprintf(filename, sizeof(filename), "%s%s/%s.ffpreset", base[i], i ? "" : "/.ffmpeg", arg);
         f= fopen(filename, "r");
 <at>  <at>  -3786,8 +3787,7  <at>  <at>  static int opt_preset(const char *opt, c
             f= fopen(filename, "r");
         }
     }
-    if(!f && ((arg[0]=='.' && arg[1]=='/') || arg[0]=='/' ||
-              is_dos_path(arg))){
+    } else {

r20436 - trunk/ffmpeg.c

Author: ramiro
Date: Tue Nov  3 00:44:11 2009
New Revision: 20436

Log:
Indent.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Tue Nov  3 00:41:54 2009	(r20435)
+++ trunk/ffmpeg.c	Tue Nov  3 00:44:11 2009	(r20436)
 <at>  <at>  -3776,17 +3776,17  <at>  <at>  static int opt_preset(const char *opt, c
                          };

     if (*opt != 'f') {
-    for(i=!base[0]; i<2 && !f; i++){
-        snprintf(filename, sizeof(filename), "%s%s/%s.ffpreset", base[i], i ? "" : "/.ffmpeg", arg);
-        f= fopen(filename, "r");
-        if(!f){
-            char *codec_name= *opt == 'v' ? video_codec_name :
-                              *opt == 'a' ? audio_codec_name :
-                                            subtitle_codec_name;
-            snprintf(filename, sizeof(filename), "%s%s/%s-%s.ffpreset", base[i],  i ? "" : "/.ffmpeg",
codec_name, arg);
+        for(i=!base[0]; i<2 && !f; i++){
+            snprintf(filename, sizeof(filename), "%s%s/%s.ffpreset", base[i], i ? "" : "/.ffmpeg", arg);
             f= fopen(filename, "r");

Re: r20435 - trunk/ffmpeg.c

On date Tuesday 2009-11-03 00:41:54 +0100, ramiro wrote:
> Author: ramiro
> Date: Tue Nov  3 00:41:54 2009
> New Revision: 20435
> 
> Log:
> Add -fpre option to take a preset file as parameter. The -[avs]pre options no
> longer accept filenames, and -fpre should be used instead.

Please update docs.

Re: r20435 - trunk/ffmpeg.c

Hi,

On Mon, Nov 2, 2009 at 10:24 PM, Stefano Sabatini
<stefano.sabatini-lala <at> poste.it> wrote:
> On date Tuesday 2009-11-03 00:41:54 +0100, ramiro wrote:
>> Author: ramiro
>> Date: Tue Nov  3 00:41:54 2009
>> New Revision: 20435
>>
>> Log:
>> Add -fpre option to take a preset file as parameter. The -[avs]pre options no
>> longer accept filenames, and -fpre should be used instead.
>
> Please update docs.

$attached, please review.

Ramiro Polla

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog <at> mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-cvslog