headers
Naoya OYAMA | 1 Aug 2011 01:03
Favicon

Cosmetics: Fix indentation.

ffmpeg | branch: master | Naoya OYAMA <naoya.oyama <at> gmail.com> | Mon Aug  1 00:17:45 2011 +0200|
[7747a091f57b1e995a524854b397925a38d82cfb] | committer: Carl Eugen Hoyos

Cosmetics: Fix indentation.

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

 libavformat/spdifenc.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c
index 04d4845..84372f8 100644
--- a/libavformat/spdifenc.c
+++ b/libavformat/spdifenc.c
 <at>  <at>  -518,13 +518,13  <at>  <at>  static int spdif_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     }

     if (ctx->extra_bswap ^ (ctx->spdif_flags & SPDIF_FLAG_BIGENDIAN)) {
-    avio_write(s->pb, ctx->out_buf, ctx->out_bytes & ~1);
+        avio_write(s->pb, ctx->out_buf, ctx->out_bytes & ~1);
     } else {
-    av_fast_malloc(&ctx->buffer, &ctx->buffer_size, ctx->out_bytes + FF_INPUT_BUFFER_PADDING_SIZE);
-    if (!ctx->buffer)
-        return AVERROR(ENOMEM);
-    ff_spdif_bswap_buf16((uint16_t *)ctx->buffer, (uint16_t *)ctx->out_buf, ctx->out_bytes >> 1);
-    avio_write(s->pb, ctx->buffer, ctx->out_bytes & ~1);
+        av_fast_malloc(&ctx->buffer, &ctx->buffer_size, ctx->out_bytes + FF_INPUT_BUFFER_PADDING_SIZE);
+        if (!ctx->buffer)
+            return AVERROR(ENOMEM);
(Continue reading)

Permalink | Reply | 1 comment |
headers
Carl Eugen Hoyos | 1 Aug 2011 01:03
Favicon

Use av_get_bits_per_sample() for mBitsPerChannel in caf.

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos <at> ag.or.at> | Mon Aug  1 00:23:07 2011 +0200|
[b35477a2f203a64fddd1a3fa96d8d6682839f788] | committer: Carl Eugen Hoyos

Use av_get_bits_per_sample() for mBitsPerChannel in caf.

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

 libavformat/cafenc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c
index c324b8e..2d64bec 100644
--- a/libavformat/cafenc.c
+++ b/libavformat/cafenc.c
 <at>  <at>  -139,7 +139,7  <at>  <at>  static int caf_write_header(AVFormatContext *s)
     avio_wb32(pb, enc->block_align);                  //< mBytesPerPacket
     avio_wb32(pb, samples_per_packet(enc->codec_id, enc->channels)); //< mFramesPerPacket
     avio_wb32(pb, enc->channels);                     //< mChannelsPerFrame
-    avio_wb32(pb, enc->bits_per_coded_sample);        //< mBitsPerChannel
+    avio_wb32(pb, av_get_bits_per_sample(enc->codec_id)); //< mBitsPerChannel

     if (enc->channel_layout) {
         ffio_wfourcc(pb, "chan");
Permalink | Reply | 0 comments |
headers
Carl Eugen Hoyos | 1 Aug 2011 01:03
Favicon

Explicitely fail for unsupported codecs when muxing caf.

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos <at> ag.or.at> | Mon Aug  1 00:28:04 2011 +0200|
[c6e0332f3062efb00a8c577e11aee70821874b2e] | committer: Carl Eugen Hoyos

Explicitely fail for unsupported codecs when muxing caf.

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

 libavformat/cafenc.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c
index 2d64bec..29b1d56 100644
--- a/libavformat/cafenc.c
+++ b/libavformat/cafenc.c
 <at>  <at>  -101,6 +101,17  <at>  <at>  static int caf_write_header(AVFormatContext *s)
     unsigned int codec_tag = ff_codec_get_tag(ff_codec_caf_tags, enc->codec_id);

     switch (enc->codec_id) {
+    case CODEC_ID_AAC:
+    case CODEC_ID_AC3:
+    case CODEC_ID_ALAC:
+    case CODEC_ID_AMR_NB:
+    case CODEC_ID_QCELP:
+    case CODEC_ID_QDM2:
+        av_log(s, AV_LOG_ERROR, "muxing codec currently unsupported\n");
+        return AVERROR_PATCHWELCOME;
+    }
+
+    switch (enc->codec_id) {
(Continue reading)

Permalink | Reply | 0 comments |
headers
Carl Eugen Hoyos | 1 Aug 2011 01:03
Favicon

Support muxing MP1, MP2 and MP3 in caf.

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos <at> ag.or.at> | Mon Aug  1 00:30:56 2011 +0200|
[9b60b076fb9ab5b39997f3969ac769c03d6abeaf] | committer: Carl Eugen Hoyos

Support muxing MP1, MP2 and MP3 in caf.

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

 libavformat/cafenc.c |   46 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c
index 29b1d56..1c77251 100644
--- a/libavformat/cafenc.c
+++ b/libavformat/cafenc.c
 <at>  <at>  -28,6 +28,10  <at>  <at> 

 typedef struct {
     int64_t data;
+    uint8_t *pkt_sizes;
+    int size_buffer_size;
+    int size_entries_used;
+    int packets;
 } CAFContext;

 static uint32_t codec_flags(enum CodecID codec_id) {
 <at>  <at>  -133,9 +137,9  <at>  <at>  static int caf_write_header(AVFormatContext *s)
         return AVERROR_INVALIDDATA;
     }
(Continue reading)

Permalink | Reply | 0 comments |
headers
Carl Eugen Hoyos | 1 Aug 2011 01:03
Favicon

Do not ignore opt_default() return values.

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos <at> ag.or.at> | Mon Aug  1 00:36:52 2011 +0200|
[8460b757c2c20b57d1dd1c1989086f942a261b4b] | committer: Carl Eugen Hoyos

Do not ignore opt_default() return values.

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

 ffmpeg.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index cc8fdd2..2a1ee79 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
 <at>  <at>  -3030,8 +3030,7  <at>  <at>  static int opt_qscale(const char *opt, const char *arg)
 static int opt_top_field_first(const char *opt, const char *arg)
 {
     top_field_first = parse_number_or_die(opt, arg, OPT_INT, 0, 1);
-    opt_default(opt, arg);
-    return 0;
+    return opt_default(opt, arg);
 }

 static int opt_thread_count(const char *opt, const char *arg)
 <at>  <at>  -3077,15 +3076,13  <at>  <at>  static int opt_audio_channels(const char *opt, const char *arg)
 static int opt_video_channel(const char *opt, const char *arg)
 {
     av_log(NULL, AV_LOG_WARNING, "This option is deprecated, use -channel.\n");
-    opt_default("channel", arg);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Carl Eugen Hoyos | 1 Aug 2011 01:03
Favicon

Unbreak ffplay -s and ffplay -pix_fmt.

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos <at> ag.or.at> | Mon Aug  1 00:40:28 2011 +0200|
[940a116b1f441b90e49886bfc07e0137ae342d5a] | committer: Carl Eugen Hoyos

Unbreak ffplay -s and ffplay -pix_fmt.

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

 doc/ffplay.texi |    9 +++++----
 ffplay.c        |   10 ++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/doc/ffplay.texi b/doc/ffplay.texi
index 44fbad1..9390e14 100644
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
 <at>  <at>  -38,8 +38,9  <at>  <at>  Force displayed width.
  <at> item -y  <at> var{height}
 Force displayed height.
  <at> item -s  <at> var{size}
-This option has been removed. Use private format options for specifying the
-input video size.
+Set frame size (WxH or abbreviation), needed for videos which do
+not contain a header with the frame size like raw YUV.  This option
+has been deprecated in favor of private options, try -video_size.
  <at> item -an
 Disable audio.
  <at> item -vn
 <at>  <at>  -89,8 +90,8  <at>  <at>  Read  <at> var{input_file}.
  <at> section Advanced options
(Continue reading)

Permalink | Reply | 0 comments |
headers
Carl Eugen Hoyos | 1 Aug 2011 01:03
Favicon

Rm lavfi-showfiltfmts on make testclean.

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos <at> ag.or.at> | Mon Aug  1 00:55:40 2011 +0200|
[b36bd27fbeaadcf265c0851643833f6847af02a0] | committer: Carl Eugen Hoyos

Rm lavfi-showfiltfmts on make testclean.

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

 tests/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index 0a9e402..34094da 100644
--- a/tests/Makefile
+++ b/tests/Makefile
 <at>  <at>  -103,7 +103,7  <at>  <at>  fate-list:
 clean:: testclean

 testclean:
-	$(RM) -r tests/vsynth1 tests/vsynth2 tests/data
+	$(RM) -r tests/vsynth1 tests/vsynth2 tests/data tools/lavfi-showfiltfmts$(EXESUF)
 	$(RM) $(CLEANSUFFIXES:%=tests/%)
 	$(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF))
Permalink | Reply | 0 comments |
headers
Carl Eugen Hoyos | 1 Aug 2011 01:03
Favicon

Cosmetics: Restore alphabetical order.

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos <at> ag.or.at> | Mon Aug  1 00:33:09 2011 +0200|
[222b333ed5dfce06583940793cc4890cc342fe9f] | committer: Carl Eugen Hoyos

Cosmetics: Restore alphabetical order.

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

 libavformat/caf.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavformat/caf.c b/libavformat/caf.c
index ce0d19b..0545330 100644
--- a/libavformat/caf.c
+++ b/libavformat/caf.c
 <at>  <at>  -34,22 +34,22  <at>  <at> 
 const AVCodecTag ff_codec_caf_tags[] = {
     { CODEC_ID_AAC,             MKTAG('a','a','c',' ') },
     { CODEC_ID_AC3,             MKTAG('a','c','-','3') },
-    { CODEC_ID_ALAC,            MKTAG('a','l','a','c') },
-  /* FIXME: use DV demuxer, as done in MOV */
-  /*{ CODEC_ID_DVAUDIO,         MKTAG('v','d','v','a') },*/
-  /*{ CODEC_ID_DVAUDIO,         MKTAG('d','v','c','a') },*/
     { CODEC_ID_ADPCM_IMA_QT,    MKTAG('i','m','a','4') },
     { CODEC_ID_ADPCM_IMA_WAV,   MKTAG('m','s', 0, 17 ) },
     { CODEC_ID_ADPCM_MS,        MKTAG('m','s', 0,  2 ) },
+    { CODEC_ID_ALAC,            MKTAG('a','l','a','c') },
     { CODEC_ID_AMR_NB,          MKTAG('s','a','m','r') },
+  /* FIXME: use DV demuxer, as done in MOV */
+  /*{ CODEC_ID_DVAUDIO,         MKTAG('v','d','v','a') },*/
(Continue reading)

Permalink | Reply | 0 comments |
headers
Carl Eugen Hoyos | 1 Aug 2011 01:36
Favicon

Remove non-existing fourcc " Y8".

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos <at> ag.or.at> | Mon Aug  1 01:26:55 2011 +0200|
[318fd9dac2d76765b2ac68338fdedb5809bf09e6] | committer: Carl Eugen Hoyos

Remove non-existing fourcc " Y8".

This reverts a line of r1842.

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

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

diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index e87a9af..a26dea8 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
 <at>  <at>  -45,7 +45,6  <at>  <at>  const PixelFormatTag ff_raw_pix_fmt_tags[] = {
     { PIX_FMT_YUVJ422P, MKTAG('Y', '4', '2', 'B') },
     { PIX_FMT_YUVJ422P, MKTAG('P', '4', '2', '2') },
     { PIX_FMT_GRAY8,    MKTAG('Y', '8', '0', '0') },
-    { PIX_FMT_GRAY8,    MKTAG(' ', ' ', 'Y', '8') },
     { PIX_FMT_GRAY8,    MKTAG('Y', '8', ' ', ' ') },

     { PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */
Permalink | Reply | 0 comments |
headers
Carl Eugen Hoyos | 1 Aug 2011 01:36
Favicon

Support FourCC DreX as MPEG4 ASP.

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos <at> ag.or.at> | Mon Aug  1 01:23:39 2011 +0200|
[1c5480651efa7cb2dbec9309e1c6938f9c85fd53] | committer: Carl Eugen Hoyos

Support FourCC DreX as MPEG4 ASP.

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

 libavformat/riff.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 37c292e..636d05c 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
 <at>  <at>  -87,6 +87,7  <at>  <at>  const AVCodecTag ff_codec_bmp_tags[] = {
     { CODEC_ID_MPEG4,        MKTAG('G', 'E', 'O', 'V') },
     { CODEC_ID_MPEG4,        MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */
     { CODEC_ID_MPEG4,        MKTAG('X', 'V', 'I', 'X') },
+    { CODEC_ID_MPEG4,        MKTAG('D', 'r', 'e', 'X') },
     { CODEC_ID_MSMPEG4V3,    MKTAG('M', 'P', '4', '3') },
     { CODEC_ID_MSMPEG4V3,    MKTAG('D', 'I', 'V', '3') },
     { CODEC_ID_MSMPEG4V3,    MKTAG('M', 'P', 'G', '3') },
Permalink | Reply | 0 comments |

Gmane