[FFmpeg-cvslog] lavf/mux: Fix a typo checking aspect ratios.

2014-07-30 Thread Carl Eugen Hoyos 
ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Jul 30 
11:03:29 2014 +0200| [355121bcb5d921c1e50b34a6f0b8da6a2c8a734f] | committer: 
Carl Eugen Hoyos

lavf/mux: Fix a typo checking aspect ratios.

Fixes ticket #3813.

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

 libavformat/mux.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index b264ce0..be72d91 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -291,7 +291,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
 ) {
 if (st->sample_aspect_ratio.num != 0 &&
 st->sample_aspect_ratio.den != 0 &&
-codec->sample_aspect_ratio.den != 0 &&
+codec->sample_aspect_ratio.num != 0 &&
 codec->sample_aspect_ratio.den != 0) {
 av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between 
muxer "
"(%d/%d) and encoder layer (%d/%d)\n",

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Add int64_t probesize2 instead of int probesize to AVFormatContext.

2014-07-30 Thread Carl Eugen Hoyos 
ffmpeg | branch: master | Carl Eugen Hoyos  | Wed Jul 30 
11:09:25 2014 +0200| [ff9a154157ecca30f585c5eb97f1cd600f500213] | committer: 
Carl Eugen Hoyos

Add int64_t probesize2 instead of int probesize to AVFormatContext.

Allows to set a probesize >2G.
Tested-by: Oliver Fromme

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

 libavformat/avformat.h  |   12 +---
 libavformat/avio_internal.h |2 +-
 libavformat/aviobuf.c   |2 +-
 libavformat/mpegts.c|   11 ++-
 libavformat/options_table.h |2 +-
 libavformat/utils.c |   13 +
 libavformat/version.h   |2 +-
 7 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 156524a..7551f7b 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1296,9 +1296,7 @@ typedef struct AVFormatContext {
 #define AVFMT_FLAG_KEEP_SIDE_DATA 0x4 ///< Don't merge side data but keep 
it separate.
 
 /**
- * Maximum size of the data read from input for determining
- * the input container format.
- * Demuxing only, set by the caller before avformat_open_input().
+ * @deprecated deprecated in favor of probesize2
  */
 unsigned int probesize;
 
@@ -1671,6 +1669,14 @@ typedef struct AVFormatContext {
  * Can be set to 0 to let avformat choose using a heuristic.
  */
 int64_t max_analyze_duration2;
+
+/**
+ * Maximum size of the data read from input for determining
+ * the input container format.
+ * Demuxing only, set by the caller before avformat_open_input()
+ * via AVOptions (NO direct access).
+ */
+int64_t probesize2;
 } AVFormatContext;
 
 int av_format_get_probe_score(const AVFormatContext *s);
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h
index bb25127..5864048 100644
--- a/libavformat/avio_internal.h
+++ b/libavformat/avio_internal.h
@@ -95,7 +95,7 @@ int ffio_set_buf_size(AVIOContext *s, int buf_size);
  * within the current pos and pos+buf_size is possible.
  * Once the stream position moves outside this window this guarantee is lost.
  */
-int ffio_ensure_seekback(AVIOContext *s, int buf_size);
+int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size);
 
 int ffio_limit(AVIOContext *s, int size);
 
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 24c6b79..c7e9203 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -767,7 +767,7 @@ int ffio_fdopen(AVIOContext **s, URLContext *h)
 return 0;
 }
 
-int ffio_ensure_seekback(AVIOContext *s, int buf_size)
+int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size)
 {
 uint8_t *buffer;
 int max_buffer_size = s->max_packet_size ?
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 04bc865..405cade 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2242,12 +2242,13 @@ static void finished_reading_packet(AVFormatContext *s, 
int raw_packet_size)
 avio_skip(pb, skip);
 }
 
-static int handle_packets(MpegTSContext *ts, int nb_packets)
+static int handle_packets(MpegTSContext *ts, int64_t nb_packets)
 {
 AVFormatContext *s = ts->stream;
 uint8_t packet[TS_PACKET_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
 const uint8_t *data;
-int packet_num, ret = 0;
+int64_t packet_num;
+int ret = 0;
 
 if (avio_tell(s->pb) != ts->last_pos) {
 int i;
@@ -2369,9 +2370,9 @@ static int mpegts_read_header(AVFormatContext *s)
 AVIOContext *pb   = s->pb;
 uint8_t buf[8 * 1024] = {0};
 int len;
-int64_t pos;
+int64_t pos, probesize = s->probesize ? s->probesize : s->probesize2;
 
-ffio_ensure_seekback(pb, s->probesize);
+ffio_ensure_seekback(pb, probesize);
 
 /* read the first 8192 bytes to get packet size */
 pos = avio_tell(pb);
@@ -2394,7 +2395,7 @@ static int mpegts_read_header(AVFormatContext *s)
 
 mpegts_open_section_filter(ts, PAT_PID, pat_cb, ts, 1);
 
-handle_packets(ts, s->probesize / ts->raw_packet_size);
+handle_packets(ts, probesize / ts->raw_packet_size);
 /* if could not find service, enable auto_guess */
 
 ts->auto_guess = 1;
diff --git a/libavformat/options_table.h b/libavformat/options_table.h
index e3943fd..94cd65c 100644
--- a/libavformat/options_table.h
+++ b/libavformat/options_table.h
@@ -36,7 +36,7 @@
 static const AVOption avformat_options[] = {
 {"avioflags", NULL, OFFSET(avio_flags), AV_OPT_TYPE_FLAGS, {.i64 = DEFAULT }, 
INT_MIN, INT_MAX, D|E, "avioflags"},
 {"direct", "reduce buffering", 0, AV_OPT_TYPE_CONST, {.i64 = AVIO_FLAG_DIRECT 
}, INT_MIN, INT_MAX, D|E, "avioflags"},
-{"probesize", "set probing size", OFFSET(probesize), AV_OPT_TYPE_INT, {.i64 = 
500 }, 32, INT_MAX, D},
+{"probesize", "set probing size", OFFSET(probesize2), AV_OPT_TYPE_INT64, {.i64 
= 500 }, 32, INT64_MAX, D},
 {"formatprobesize", "number of bytes to probe file format", 
OFF

[FFmpeg-cvslog] ffmpeg_filter: refuse to configure input without a decoder.

2014-07-30 Thread Nicolas George 
ffmpeg | branch: master | Nicolas George  | Fri Jul 18 
10:34:39 2014 +0200| [91244073fd8b983e7cd1f97da83daf956fbbddc6] | committer: 
Nicolas George

ffmpeg_filter: refuse to configure input without a decoder.

The decoder is necessary in order to filter frames.
This makes the error message clearer in this case:
currently, it will usually fail because the pixel or sample
format is not defined and is converted into "(null)"
(non-portable).

Enhance trac ticket #3779.

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

 ffmpeg_filter.c |6 ++
 1 file changed, 6 insertions(+)

diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index 50ee422..b6dc42f 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -830,6 +830,12 @@ static int configure_input_filter(FilterGraph *fg, 
InputFilter *ifilter,
 av_freep(&ifilter->name);
 DESCRIBE_FILTER_LINK(ifilter, in, 1);
 
+if (!ifilter->ist->dec) {
+av_log(NULL, AV_LOG_ERROR,
+   "No decoder for stream #%d:%d, filtering impossible\n",
+   ifilter->ist->file_index, ifilter->ist->st->index);
+return AVERROR_DECODER_NOT_FOUND;
+}
 switch (avfilter_pad_get_type(in->filter_ctx->input_pads, in->pad_idx)) {
 case AVMEDIA_TYPE_VIDEO: return configure_input_video_filter(fg, ifilter, 
in);
 case AVMEDIA_TYPE_AUDIO: return configure_input_audio_filter(fg, ifilter, 
in);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] vf_select: Drop a debug av_log with an unchecked double to enum conversion

2014-07-30 Thread Diego Biurrun 
ffmpeg | branch: master | Diego Biurrun  | Tue Jul 29 
05:43:04 2014 -0700| [a8d803a320fb08b3ad5db4fffc79abd401206905] | committer: 
Diego Biurrun

vf_select: Drop a debug av_log with an unchecked double to enum conversion

CC: libav-sta...@libav.org

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

 libavfilter/vf_select.c |   12 
 1 file changed, 12 deletions(-)

diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c
index 22be1fd..8d0e6c3 100644
--- a/libavfilter/vf_select.c
+++ b/libavfilter/vf_select.c
@@ -205,18 +205,6 @@ static int select_frame(AVFilterContext *ctx, AVFrame 
*frame)
 select->var_values[VAR_PICT_TYPE] = frame->pict_type;
 
 res = av_expr_eval(select->expr, select->var_values, NULL);
-av_log(inlink->dst, AV_LOG_DEBUG,
-   "n:%d pts:%d t:%f interlace_type:%c key:%d pict_type:%c "
-   "-> select:%f\n",
-   (int)select->var_values[VAR_N],
-   (int)select->var_values[VAR_PTS],
-   select->var_values[VAR_T],
-   select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_P ? 'P' :
-   select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_T ? 'T' :
-   select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_B ? 'B' : 
'?',
-   (int)select->var_values[VAR_KEY],
-   av_get_picture_type_char(select->var_values[VAR_PICT_TYPE]),
-   res);
 
 select->var_values[VAR_N] += 1.0;
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'a8d803a320fb08b3ad5db4fffc79abd401206905'

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Jul 30 
17:32:15 2014 +0200| [7994c1cd760838ca5b92401caa1994bc035d08b5] | committer: 
Michael Niedermayer

Merge commit 'a8d803a320fb08b3ad5db4fffc79abd401206905'

* commit 'a8d803a320fb08b3ad5db4fffc79abd401206905':
  vf_select: Drop a debug av_log with an unchecked double to enum conversion

Conflicts:
libavfilter/f_select.c

Not merged, see next commit for the bugfix

Merged-by: Michael Niedermayer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avfilter/f_select: avoid using doubles for equals checks and casts to enums

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Jul 30 
17:37:09 2014 +0200| [887d8d293fc31c949427f971f37c126b3812b451] | committer: 
Michael Niedermayer

avfilter/f_select: avoid using doubles for equals checks and casts to enums

This might silence some warnings.

Issue found from: a8d803a320fb08b3ad5db4fffc79abd401206905
Signed-off-by: Michael Niedermayer 

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

 libavfilter/f_select.c |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c
index c7c53b4..e6a9857 100644
--- a/libavfilter/f_select.c
+++ b/libavfilter/f_select.c
@@ -342,10 +342,9 @@ static void select_frame(AVFilterContext *ctx, AVFrame 
*frame)
 switch (inlink->type) {
 case AVMEDIA_TYPE_VIDEO:
 av_log(inlink->dst, AV_LOG_DEBUG, " interlace_type:%c pict_type:%c 
scene:%f",
-   select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_P ? 
'P' :
-   select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_T ? 
'T' :
-   select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_B ? 
'B' : '?',
-   av_get_picture_type_char(select->var_values[VAR_PICT_TYPE]),
+   (!frame->interlaced_frame) ? 'P' :
+   frame->top_field_first ? 'T' : 'B',
+   av_get_picture_type_char(frame->pict_type),
select->var_values[VAR_SCENE]);
 break;
 case AVMEDIA_TYPE_AUDIO:

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avfilter/f_select: avoid double->int in debug output

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Jul 30 
17:50:35 2014 +0200| [6f622e5fcbe8484af194436b8dd4ff01f092ab99] | committer: 
Michael Niedermayer

avfilter/f_select: avoid double->int in debug output

Signed-off-by: Michael Niedermayer 

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

 libavfilter/f_select.c |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c
index a0a609c..8d2c860 100644
--- a/libavfilter/f_select.c
+++ b/libavfilter/f_select.c
@@ -338,7 +338,7 @@ static void select_frame(AVFilterContext *ctx, AVFrame 
*frame)
select->var_values[VAR_N],
select->var_values[VAR_PTS],
select->var_values[VAR_T],
-   (int)select->var_values[VAR_KEY]);
+   frame->key_frame);
 
 switch (inlink->type) {
 case AVMEDIA_TYPE_VIDEO:
@@ -349,9 +349,9 @@ static void select_frame(AVFilterContext *ctx, AVFrame 
*frame)
select->var_values[VAR_SCENE]);
 break;
 case AVMEDIA_TYPE_AUDIO:
-av_log(inlink->dst, AV_LOG_DEBUG, " samples_n:%d 
consumed_samples_n:%d",
-   (int)select->var_values[VAR_SAMPLES_N],
-   (int)select->var_values[VAR_CONSUMED_SAMPLES_N]);
+av_log(inlink->dst, AV_LOG_DEBUG, " samples_n:%d 
consumed_samples_n:%f",
+   frame->nb_samples,
+   select->var_values[VAR_CONSUMED_SAMPLES_N]);
 break;
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avfilter/f_select: Set var_values[VAR_KEY] correctly

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Jul 30 
17:48:33 2014 +0200| [bcbfb95b0e327679337eaca59c247a2580ea4105] | committer: 
Michael Niedermayer

avfilter/f_select: Set var_values[VAR_KEY] correctly

Signed-off-by: Michael Niedermayer 

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

 libavfilter/f_select.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c
index e6a9857..a0a609c 100644
--- a/libavfilter/f_select.c
+++ b/libavfilter/f_select.c
@@ -308,6 +308,7 @@ static void select_frame(AVFilterContext *ctx, AVFrame 
*frame)
 select->var_values[VAR_PTS] = TS2D(frame->pts);
 select->var_values[VAR_T  ] = TS2D(frame->pts) * av_q2d(inlink->time_base);
 select->var_values[VAR_POS] = av_frame_get_pkt_pos(frame) == -1 ? NAN : 
av_frame_get_pkt_pos(frame);
+select->var_values[VAR_KEY] = frame->key_frame;
 
 switch (inlink->type) {
 case AVMEDIA_TYPE_AUDIO:

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avutil/frame: add av_frame_side_data_name()

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Jul 30 
01:09:06 2014 +0200| [ba3e3311ef3f8b33a975535988d2305cea15d514] | committer: 
Michael Niedermayer

avutil/frame: add av_frame_side_data_name()

Signed-off-by: Michael Niedermayer 

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

 doc/APIchanges  |3 +++
 libavutil/frame.c   |   14 ++
 libavutil/frame.h   |5 +
 libavutil/version.h |2 +-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 090e513..5a0989d 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil: 2012-10-22
 
 API changes, most recent first:
 
+2014-07-30 - xxx - lavu 52.94.100 - frame.h
+  Add av_frame_side_data_name()
+
 2014-07-xx - xxx - lavu 53.19.0 - avstring.h
   Make name matching function from lavf public as av_match_name().
 
diff --git a/libavutil/frame.c b/libavutil/frame.c
index fdfbc46..2c62922 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -672,3 +672,17 @@ void av_frame_remove_side_data(AVFrame *frame, enum 
AVFrameSideDataType type)
 }
 }
 }
+
+const char *av_frame_side_data_name(enum AVFrameSideDataType type)
+{
+switch(type) {
+case AV_FRAME_DATA_PANSCAN: return "AVPanScan";
+case AV_FRAME_DATA_A53_CC:  return "ATSC A53 Part 4 Closed 
Captions";
+case AV_FRAME_DATA_STEREO3D:return "Stereoscopic 3d metadata";
+case AV_FRAME_DATA_MATRIXENCODING:  return "AVMatrixEncoding";
+case AV_FRAME_DATA_DOWNMIX_INFO:return "Metadata relevant to a downmix 
procedure";
+case AV_FRAME_DATA_REPLAYGAIN:  return "AVReplayGain";
+case AV_FRAME_DATA_DISPLAYMATRIX:   return "3x3 displaymatrix";
+}
+return NULL;
+}
diff --git a/libavutil/frame.h b/libavutil/frame.h
index a39c8d0..c57eb55 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -728,6 +728,11 @@ AVFrameSideData *av_frame_get_side_data(const AVFrame 
*frame,
 void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type);
 
 /**
+ * @return a string identifying the side data type
+ */
+const char *av_frame_side_data_name(enum AVFrameSideDataType type);
+
+/**
  * @}
  */
 
diff --git a/libavutil/version.h b/libavutil/version.h
index 0c69a78..42e2db5 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -56,7 +56,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  52
-#define LIBAVUTIL_VERSION_MINOR  93
+#define LIBAVUTIL_VERSION_MINOR  94
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffprobe: print some basic information about avframe side data

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Thu Jan 30 
00:54:36 2014 +0100| [547d64a49a870e83463edd23fb0af736673ea9f2] | committer: 
Michael Niedermayer

ffprobe: print some basic information about avframe side data

Reviewed-by: Stefano Sabatini 
Signed-off-by: Michael Niedermayer 

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

 doc/ffprobe.xsd |   11 +++
 ffprobe.c   |   21 -
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index 9ef9ecb..2d933c1 100644
--- a/doc/ffprobe.xsd
+++ b/doc/ffprobe.xsd
@@ -55,6 +55,7 @@
 
   
 
+
   
 
   
@@ -91,6 +92,16 @@
   
 
 
+
+
+
+
+
+
+
+
+
+
 
   
   
diff --git a/ffprobe.c b/ffprobe.c
index 1329466..01b5eb2 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -123,6 +123,8 @@ typedef enum {
 SECTION_ID_FRAME,
 SECTION_ID_FRAMES,
 SECTION_ID_FRAME_TAGS,
+SECTION_ID_FRAME_SIDE_DATA_LIST,
+SECTION_ID_FRAME_SIDE_DATA,
 SECTION_ID_LIBRARY_VERSION,
 SECTION_ID_LIBRARY_VERSIONS,
 SECTION_ID_PACKET,
@@ -152,8 +154,10 @@ static struct section sections[] = {
 [SECTION_ID_FORMAT] = { SECTION_ID_FORMAT, "format", 0, { 
SECTION_ID_FORMAT_TAGS, -1 } },
 [SECTION_ID_FORMAT_TAGS] ={ SECTION_ID_FORMAT_TAGS, "tags", 
SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = 
"format_tags" },
 [SECTION_ID_FRAMES] = { SECTION_ID_FRAMES, "frames", 
SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME, SECTION_ID_SUBTITLE, -1 } },
-[SECTION_ID_FRAME] =  { SECTION_ID_FRAME, "frame", 0, { 
SECTION_ID_FRAME_TAGS, -1 } },
+[SECTION_ID_FRAME] =  { SECTION_ID_FRAME, "frame", 0, { 
SECTION_ID_FRAME_TAGS, SECTION_ID_FRAME_SIDE_DATA_LIST, -1 } },
 [SECTION_ID_FRAME_TAGS] = { SECTION_ID_FRAME_TAGS, "tags", 
SECTION_FLAG_HAS_VARIABLE_FIELDS, { -1 }, .element_name = "tag", .unique_name = 
"frame_tags" },
+[SECTION_ID_FRAME_SIDE_DATA_LIST] ={ SECTION_ID_FRAME_SIDE_DATA_LIST, 
"side_data_list", SECTION_FLAG_IS_ARRAY, { SECTION_ID_FRAME_SIDE_DATA, -1 } },
+[SECTION_ID_FRAME_SIDE_DATA] = { SECTION_ID_FRAME_SIDE_DATA, 
"side_data", 0, { -1 } },
 [SECTION_ID_LIBRARY_VERSIONS] =   { SECTION_ID_LIBRARY_VERSIONS, 
"library_versions", SECTION_FLAG_IS_ARRAY, { SECTION_ID_LIBRARY_VERSION, -1 } },
 [SECTION_ID_LIBRARY_VERSION] ={ SECTION_ID_LIBRARY_VERSION, 
"library_version", 0, { -1 } },
 [SECTION_ID_PACKETS] ={ SECTION_ID_PACKETS, "packets", 
SECTION_FLAG_IS_ARRAY, { SECTION_ID_PACKET, -1} },
@@ -1722,6 +1726,7 @@ static void show_frame(WriterContext *w, AVFrame *frame, 
AVStream *stream,
 {
 AVBPrint pbuf;
 const char *s;
+int i;
 
 av_bprint_init(&pbuf, 1, AV_BPRINT_SIZE_UNLIMITED);
 
@@ -1784,6 +1789,20 @@ static void show_frame(WriterContext *w, AVFrame *frame, 
AVStream *stream,
 }
 if (do_show_frame_tags)
 show_tags(w, av_frame_get_metadata(frame), SECTION_ID_FRAME_TAGS);
+if (frame->nb_side_data) {
+writer_print_section_header(w, SECTION_ID_FRAME_SIDE_DATA_LIST);
+for (i = 0; i < frame->nb_side_data; i++) {
+AVFrameSideData *sd = frame->side_data[i];
+const char *name;
+
+writer_print_section_header(w, SECTION_ID_FRAME_SIDE_DATA);
+name = av_frame_side_data_name(sd->type);
+print_str("side_data_type", name ? name : "unknown");
+print_int("side_data_size", sd->size);
+writer_print_section_footer(w);
+}
+writer_print_section_footer(w);
+}
 
 writer_print_section_footer(w);
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] eamad: use the bytestream2 API instead of AV_RL

2014-07-30 Thread Anton Khirnov 
ffmpeg | branch: release/2.2 | Anton Khirnov  | Sun Jul 20 
12:06:47 2014 +| [f9204ec56a4cf73843d1e5b8563d3584c2c05b47] | committer: 
Reinhard Tartler

eamad: use the bytestream2 API instead of AV_RL

This is safer and possibly fixes invalid reads on truncated data.
(cherry-picked from commit 541427ab4d5b4b6f5a90a687a06decdb78e7bc3c)

CC:libav-sta...@libav.org

Conflicts:
libavcodec/eamad.c

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

 libavcodec/eamad.c |   37 -
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
index 22070a4..99a4e77 100644
--- a/libavcodec/eamad.c
+++ b/libavcodec/eamad.c
@@ -29,6 +29,7 @@
  */
 
 #include "avcodec.h"
+#include "bytestream.h"
 #include "get_bits.h"
 #include "aandcttab.h"
 #include "eaidct.h"
@@ -229,30 +230,32 @@ static int decode_frame(AVCodecContext *avctx,
 {
 const uint8_t *buf = avpkt->data;
 int buf_size   = avpkt->size;
-const uint8_t *buf_end = buf+buf_size;
 MadContext *s = avctx->priv_data;
 AVFrame *frame= data;
+GetByteContext gb;
 int width, height;
 int chunk_type;
 int inter, ret;
 
-if (buf_size < 17) {
-av_log(avctx, AV_LOG_ERROR, "Input buffer too small\n");
-*got_frame = 0;
-return -1;
-}
+bytestream2_init(&gb, buf, buf_size);
 
-chunk_type = AV_RL32(&buf[0]);
+chunk_type = bytestream2_get_le32(&gb);
 inter = (chunk_type == MADm_TAG || chunk_type == MADe_TAG);
-buf += 8;
+bytestream2_skip(&gb, 10);
 
 av_reduce(&avctx->time_base.num, &avctx->time_base.den,
-  AV_RL16(&buf[6]), 1000, 1<<30);
+  bytestream2_get_le16(&gb), 1000, 1<<30);
+
+width  = bytestream2_get_le16(&gb);
+height = bytestream2_get_le16(&gb);
+bytestream2_skip(&gb, 1);
+calc_quant_matrix(s, bytestream2_get_byte(&gb));
+bytestream2_skip(&gb, 2);
 
-width  = AV_RL16(&buf[8]);
-height = AV_RL16(&buf[10]);
-calc_quant_matrix(s, buf[13]);
-buf += 16;
+if (bytestream2_get_bytes_left(&gb) < 2) {
+av_log(avctx, AV_LOG_ERROR, "Input data too small\n");
+return AVERROR_INVALIDDATA;
+}
 
 if (avctx->width != width || avctx->height != height) {
 av_frame_unref(s->last_frame);
@@ -279,12 +282,12 @@ static int decode_frame(AVCodecContext *avctx,
 }
 
 av_fast_padded_malloc(&s->bitstream_buf, &s->bitstream_buf_size,
-  buf_end - buf);
+  bytestream2_get_bytes_left(&gb));
 if (!s->bitstream_buf)
 return AVERROR(ENOMEM);
-s->dsp.bswap16_buf(s->bitstream_buf, (const uint16_t*)buf, 
(buf_end-buf)/2);
-init_get_bits(&s->gb, s->bitstream_buf, 8*(buf_end-buf));
-
+s->dsp.bswap16_buf(s->bitstream_buf, (const uint16_t *)(buf + 
bytestream2_tell(&gb)),
+ bytestream2_get_bytes_left(&gb) / 2);
+init_get_bits(&s->gb, s->bitstream_buf, 
8*(bytestream2_get_bytes_left(&gb)));
 for (s->mb_y=0; s->mb_y < (avctx->height+15)/16; s->mb_y++)
 for (s->mb_x=0; s->mb_x < (avctx->width +15)/16; s->mb_x++)
 decode_mb(s, frame, inter);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'f9204ec56a4cf73843d1e5b8563d3584c2c05b47' into release/2.2

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.2 | Michael Niedermayer  | Wed Jul 
30 19:59:38 2014 +0200| [357325603719a1283a7375b6df9ddb7fafe203fe] | committer: 
Michael Niedermayer

Merge commit 'f9204ec56a4cf73843d1e5b8563d3584c2c05b47' into release/2.2

* commit 'f9204ec56a4cf73843d1e5b8563d3584c2c05b47':
  eamad: use the bytestream2 API instead of AV_RL

Conflicts:
libavcodec/eamad.c

Merged-by: Michael Niedermayer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] arm: Avoid using the 'setend' instruction on ARMv7 and newer

2014-07-30 Thread Martin Storsjö 
ffmpeg | branch: release/2.2 | Martin Storsjö  | Fri Jul  4 
18:21:50 2014 +0300| [b8e57113ecba5494d4bf47c29634392ea5fdb17b] | committer: 
Reinhard Tartler

arm: Avoid using the 'setend' instruction on ARMv7 and newer

This instruction is deprecated on ARMv8, and it is serializing on
some ARMv7 cores as well [1].

[1] http://article.gmane.org/gmane.linux.ports.arm.kernel/339293

CC: libav-sta...@libav.org
Signed-off-by: Martin Storsjö 
(cherry picked from commit 79fce1ec8abd017593c003917fc123f7119a78d6)
Signed-off-by: Reinhard Tartler 

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

 libavcodec/arm/h264dsp_init_arm.c |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavcodec/arm/h264dsp_init_arm.c 
b/libavcodec/arm/h264dsp_init_arm.c
index 92658e7..f9712d8 100644
--- a/libavcodec/arm/h264dsp_init_arm.c
+++ b/libavcodec/arm/h264dsp_init_arm.c
@@ -104,8 +104,12 @@ av_cold void ff_h264dsp_init_arm(H264DSPContext *c, const 
int bit_depth,
 {
 int cpu_flags = av_get_cpu_flags();
 
-if (have_armv6(cpu_flags))
+if (have_armv6(cpu_flags) && !(have_vfpv3(cpu_flags) || 
have_neon(cpu_flags))) {
+// This function uses the 'setend' instruction which is deprecated
+// on ARMv8. This instruction is serializing on some ARMv7 cores as
+// well. Therefore, only use the function on ARMv6.
 c->h264_find_start_code_candidate = 
ff_h264_find_start_code_candidate_armv6;
+}
 if (have_neon(cpu_flags))
 h264dsp_init_neon(c, bit_depth, chroma_format_idc);
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avplay: Handle pixel aspect ratio properly

2014-07-30 Thread Martin Storsjö 
ffmpeg | branch: release/2.2 | Martin Storsjö  | Sun Jul  6 
23:18:27 2014 +0300| [407912d17870a53e8a8cc072f192cadf358bc155] | committer: 
Reinhard Tartler

avplay: Handle pixel aspect ratio properly

This was broken (left half-implemented) in 354468fc12.

CC: libav-sta...@libav.org
Signed-off-by: Martin Storsjö 
(cherry picked from commit cf280ed004b5c618560f8f43d14ff264bd1e4c3d)
Signed-off-by: Reinhard Tartler 

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

 avplay.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/avplay.c b/avplay.c
index b70ee54..2db8928 100644
--- a/avplay.c
+++ b/avplay.c
@@ -1323,6 +1323,8 @@ static int queue_picture(VideoState *is, AVFrame 
*src_frame, double pts, int64_t
 
 vp = &is->pictq[is->pictq_windex];
 
+vp->sar = src_frame->sample_aspect_ratio;
+
 /* alloc or resize hardware picture buffer */
 if (!vp->bmp || vp->reallocate ||
 #if CONFIG_AVFILTER

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Prepare for 10.3 Release

2014-07-30 Thread Reinhard Tartler 
ffmpeg | branch: release/2.2 | Reinhard Tartler  | Sun Jul 
27 10:14:04 2014 -0400| [12bbd819cbdfdd2b41286c5ccabee7f5e5b6612a] | committer: 
Reinhard Tartler

Prepare for 10.3 Release

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

 RELEASE |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE b/RELEASE
index e2498ea..260e375 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-10.2
+10.3

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '407912d17870a53e8a8cc072f192cadf358bc155' into release/2.2

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.2 | Michael Niedermayer  | Wed Jul 
30 20:14:09 2014 +0200| [f4e08695602b89fd99af23ea934520737ee2d3d6] | committer: 
Michael Niedermayer

Merge commit '407912d17870a53e8a8cc072f192cadf358bc155' into release/2.2

* commit '407912d17870a53e8a8cc072f192cadf358bc155':
  avplay: Handle pixel aspect ratio properly

See: 32fdfdfbdac64c57b12910521af1379a24d01f73
See: 99b01e458c268cf18ac0981e644e0f835957498a
See: 825ec16da955fd9c726d8e6c846cf9257a781a87
Merged-by: Michael Niedermayer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '12bbd819cbdfdd2b41286c5ccabee7f5e5b6612a' into release/2.2

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.2 | Michael Niedermayer  | Wed Jul 
30 20:12:45 2014 +0200| [6135baa85bda0d8d5ecc3f742858424eb3daf75d] | committer: 
Michael Niedermayer

Merge commit '12bbd819cbdfdd2b41286c5ccabee7f5e5b6612a' into release/2.2

* commit '12bbd819cbdfdd2b41286c5ccabee7f5e5b6612a':
  Prepare for 10.3 Release

Conflicts:
RELEASE

Not merged, as FFmpeg has different version numbers

Merged-by: Michael Niedermayer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'b8e57113ecba5494d4bf47c29634392ea5fdb17b' into release/2.2

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.2 | Michael Niedermayer  | Wed Jul 
30 20:18:14 2014 +0200| [92c49737522112e9cbe60725cd221046b74b7e1f] | committer: 
Michael Niedermayer

Merge commit 'b8e57113ecba5494d4bf47c29634392ea5fdb17b' into release/2.2

* commit 'b8e57113ecba5494d4bf47c29634392ea5fdb17b':
  arm: Avoid using the 'setend' instruction on ARMv7 and newer

Merged-by: Michael Niedermayer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] mxfdec: add missing "const" to array declaration.

2014-07-30 Thread Reimar Döffinger 
ffmpeg | branch: master | Reimar Döffinger  | Tue Jul 
29 20:17:28 2014 +0200| [04aec74f45692b38f80778c740310daa02cb2caf] | committer: 
Reimar Döffinger

mxfdec: add missing "const" to array declaration.

Signed-off-by: Reimar Döffinger 

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

 libavformat/mxfdec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 151b61b..467d184 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -990,7 +990,7 @@ static const MXFCodecUL mxf_data_essence_container_uls[] = {
 { { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x09,0x0d,0x01,0x03,0x01,0x02,0x0e,0x00,0x00 
}, 16, AV_CODEC_ID_NONE },
 };
 
-static const char* mxf_data_essence_descriptor[] = {
+static const char* const mxf_data_essence_descriptor[] = {
 "vbi_vanc_smpte_436M",
 };
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] movdec: remove nonsensical snprintf.

2014-07-30 Thread Reimar Döffinger 
ffmpeg | branch: master | Reimar Döffinger  | Tue Jul 
29 21:13:10 2014 +0200| [1c84aad718f0b2a6c8bd318ebc08240dcbe5ae8b] | committer: 
Reimar Döffinger

movdec: remove nonsensical snprintf.

Signed-off-by: Reimar Döffinger 

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

 libavformat/mov.c |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index cfe76cd..ab85918 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -119,15 +119,13 @@ static int mov_metadata_gnre(MOVContext *c, AVIOContext 
*pb,
  unsigned len, const char *key)
 {
 short genre;
-char buf[20];
 
 avio_r8(pb); // unknown
 
 genre = avio_r8(pb);
 if (genre < 1 || genre > ID3v1_GENRE_MAX)
 return 0;
-snprintf(buf, sizeof(buf), "%s", ff_id3v1_genre_str[genre-1]);
-av_dict_set(&c->fc->metadata, key, buf, 0);
+av_dict_set(&c->fc->metadata, key, ff_id3v1_genre_str[genre-1], 0);
 
 return 0;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] vf_select: Drop a debug av_log with an unchecked double to enum conversion

2014-07-30 Thread Diego Biurrun 
ffmpeg | branch: release/2.2 | Diego Biurrun  | Tue Jul 29 
05:43:04 2014 -0700| [01a550bda29eb05fb230576e5223034974aa3396] | committer: 
Diego Biurrun

vf_select: Drop a debug av_log with an unchecked double to enum conversion

CC: libav-sta...@libav.org
(cherry picked from commit a8d803a320fb08b3ad5db4fffc79abd401206905)
Signed-off-by: Diego Biurrun 

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

 libavfilter/vf_select.c |   12 
 1 file changed, 12 deletions(-)

diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c
index fc69c89..868e544 100644
--- a/libavfilter/vf_select.c
+++ b/libavfilter/vf_select.c
@@ -205,18 +205,6 @@ static int select_frame(AVFilterContext *ctx, AVFrame 
*frame)
 select->var_values[VAR_PICT_TYPE] = frame->pict_type;
 
 res = av_expr_eval(select->expr, select->var_values, NULL);
-av_log(inlink->dst, AV_LOG_DEBUG,
-   "n:%d pts:%d t:%f interlace_type:%c key:%d pict_type:%c "
-   "-> select:%f\n",
-   (int)select->var_values[VAR_N],
-   (int)select->var_values[VAR_PTS],
-   select->var_values[VAR_T],
-   select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_P ? 'P' :
-   select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_T ? 'T' :
-   select->var_values[VAR_INTERLACE_TYPE] == INTERLACE_TYPE_B ? 'B' : 
'?',
-   (int)select->var_values[VAR_KEY],
-   av_get_picture_type_char(select->var_values[VAR_PICT_TYPE]),
-   res);
 
 select->var_values[VAR_N] += 1.0;
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'f6b3dce952d66f87883a50d90d6e98416ee397df' into release/2.2

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.2 | Michael Niedermayer  | Wed Jul 
30 20:29:30 2014 +0200| [f02221d65143aa9a5719fa83f159daaa1308b6a0] | committer: 
Michael Niedermayer

Merge commit 'f6b3dce952d66f87883a50d90d6e98416ee397df' into release/2.2

* commit 'f6b3dce952d66f87883a50d90d6e98416ee397df':
  librtmp: Don't free the temp url at the end of rtmp_open

Conflicts:
libavformat/librtmp.c

Merged-by: Michael Niedermayer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] librtmp: Don't free the temp url at the end of rtmp_open

2014-07-30 Thread Martin Storsjö 
ffmpeg | branch: release/2.2 | Martin Storsjö  | Fri Jul  4 
22:13:39 2014 +0300| [f6b3dce952d66f87883a50d90d6e98416ee397df] | committer: 
Reinhard Tartler

librtmp: Don't free the temp url at the end of rtmp_open

librtmp can keep pointers to this string internally, and may
use them at shutdown as well.

CC: libav-sta...@libav.org
Signed-off-by: Martin Storsjö 
(cherry picked from commit 865461099e062de5a3a109c2a5be98004c11d8bd)
Signed-off-by: Reinhard Tartler 

Conflicts:
libavformat/librtmp.c

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

 libavformat/librtmp.c |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c
index 7133bd6..5682c9c 100644
--- a/libavformat/librtmp.c
+++ b/libavformat/librtmp.c
@@ -38,6 +38,7 @@ typedef struct LibRTMPContext {
 RTMP rtmp;
 char *app;
 char *playpath;
+char *temp_filename;
 } LibRTMPContext;
 
 static void rtmp_log(int level, const char *fmt, va_list args)
@@ -62,6 +63,7 @@ static int rtmp_close(URLContext *s)
 RTMP *r = &ctx->rtmp;
 
 RTMP_Close(r);
+av_freep(&ctx->temp_filename);
 return 0;
 }
 
@@ -101,7 +103,7 @@ static int rtmp_open(URLContext *s, const char *uri, int 
flags)
 if (ctx->app)  len += strlen(ctx->app)  + sizeof(" app=");
 if (ctx->playpath) len += strlen(ctx->playpath) + sizeof(" playpath=");
 
-if (!(filename = av_malloc(len)))
+if (!(ctx->temp_filename = filename = av_malloc(len)))
 return AVERROR(ENOMEM);
 
 av_strlcpy(filename, s->filename, len);
@@ -130,10 +132,9 @@ static int rtmp_open(URLContext *s, const char *uri, int 
flags)
 }
 
 s->is_streamed = 1;
-rc = 0;
+return 0;
 fail:
-if (filename != s->filename)
-av_freep(&filename);
+av_freep(&ctx->temp_filename);
 return rc;
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea' into release/2.2

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.2 | Michael Niedermayer  | Wed Jul 
30 20:35:23 2014 +0200| [3ef8b4322cba2ebf9fd6b1c15d068ee90e9f9f96] | committer: 
Michael Niedermayer

Merge commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea' into release/2.2

* commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea':
  fate: Add dependencies for dct/fft/mdct/rdft tests

Conflicts:
libavcodec/fft-test.c
tests/fate/fft.mak

Merged-by: Michael Niedermayer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '01a550bda29eb05fb230576e5223034974aa3396' into release/2.2

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.2 | Michael Niedermayer  | Wed Jul 
30 20:33:24 2014 +0200| [75ff0e8c50d12c40170a21479ac07f573952cdf2] | committer: 
Michael Niedermayer

Merge commit '01a550bda29eb05fb230576e5223034974aa3396' into release/2.2

* commit '01a550bda29eb05fb230576e5223034974aa3396':
  vf_select: Drop a debug av_log with an unchecked double to enum conversion

Conflicts:
libavfilter/f_select.c

See: 7994c1cd760838ca5b92401caa1994bc035d08b5
Merged-by: Michael Niedermayer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf' into release/2.2

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.2 | Michael Niedermayer  | Wed Jul 
30 20:34:13 2014 +0200| [9dc112e277fd67e05044b34ce9fb3177905f2db5] | committer: 
Michael Niedermayer

Merge commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf' into release/2.2

* commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf':
  video4linux2: Avoid a floating point exception

Merged-by: Michael Niedermayer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] fate: Add dependencies for dct/fft/mdct/rdft tests

2014-07-30 Thread Diego Biurrun 
ffmpeg | branch: release/2.2 | Diego Biurrun  | Wed Jun 25 
17:09:13 2014 -0700| [d396987c303bdc4eea7d1a1ff6776475d9bbd9ea] | committer: 
Diego Biurrun

fate: Add dependencies for dct/fft/mdct/rdft tests

(cherry picked from commit 24f45c16224d4c5d482e928676714766ffdda4fc)
Signed-off-by: Diego Biurrun 

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

 libavcodec/fft-test.c |   22 ++
 tests/fate/fft.mak|   32 
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c
index d0c22d0..142a61d 100644
--- a/libavcodec/fft-test.c
+++ b/libavcodec/fft-test.c
@@ -113,6 +113,7 @@ static void fft_ref(FFTComplex *tabr, FFTComplex *tab, int 
nbits)
 }
 }
 
+#if CONFIG_MDCT
 static void imdct_ref(FFTSample *out, FFTSample *in, int nbits)
 {
 int n = 1> 1;
 if (do_inverse) {
@@ -407,6 +420,8 @@ int main(int argc, char **argv)
 err = check_diff((float *)tab_ref, (float *)tab2, fft_size, 1.0);
 }
 break;
+#endif /* CONFIG_RDFT */
+#if CONFIG_DCT
 case TRANSFORM_DCT:
 memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
 d->dct_calc(d, tab);
@@ -417,6 +432,7 @@ int main(int argc, char **argv)
 }
 err = check_diff((float *)tab_ref, (float *)tab, fft_size, 1.0);
 break;
+#endif /* CONFIG_DCT */
 #endif
 }
 
@@ -468,19 +484,25 @@ int main(int argc, char **argv)
 }
 
 switch (transform) {
+#if CONFIG_MDCT
 case TRANSFORM_MDCT:
 ff_mdct_end(m);
 break;
+#endif /* CONFIG_MDCT */
 case TRANSFORM_FFT:
 ff_fft_end(s);
 break;
 #if FFT_FLOAT
+#if CONFIG_RDFT
 case TRANSFORM_RDFT:
 ff_rdft_end(r);
 break;
+#endif /* CONFIG_RDFT */
+#if CONFIG_DCT
 case TRANSFORM_DCT:
 ff_dct_end(d);
 break;
+#endif /* CONFIG_DCT */
 #endif
 }
 
diff --git a/tests/fate/fft.mak b/tests/fate/fft.mak
index 20d5638..d2a3904 100644
--- a/tests/fate/fft.mak
+++ b/tests/fate/fft.mak
@@ -1,8 +1,8 @@
 define DEF_FFT
-FATE_FFT += fate-fft-$(1)   fate-ifft-$(1)   \
-fate-mdct-$(1)  fate-imdct-$(1)  \
-fate-rdft-$(1)  fate-irdft-$(1)  \
-fate-dct1d-$(1) fate-idct1d-$(1)
+FATE_FFT-$(CONFIG_DCT)  += fate-dct1d-$(1) fate-idct1d-$(1)
+FATE_FFT-$(CONFIG_FFT)  += fate-fft-$(1)   fate-ifft-$(1)
+FATE_FFT-$(CONFIG_MDCT) += fate-mdct-$(1)  fate-imdct-$(1)
+FATE_FFT-$(CONFIG_RDFT) += fate-rdft-$(1)  fate-irdft-$(1)
 
 fate-fft-$(N):ARGS = -n$(1)
 fate-ifft-$(N):   ARGS = -n$(1) -i
@@ -16,14 +16,14 @@ endef
 
 $(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT,$(N
 
-fate-fft-test: $(FATE_FFT)
-$(FATE_FFT): libavcodec/fft-test$(EXESUF)
-$(FATE_FFT): CMD = run libavcodec/fft-test $(CPUFLAGS:%=-c%) $(ARGS)
-$(FATE_FFT): REF = /dev/null
+fate-fft-float: $(FATE_FFT-yes)
+$(FATE_FFT-yes): libavcodec/fft-test$(EXESUF)
+$(FATE_FFT-yes): CMD = run libavcodec/fft-test $(CPUFLAGS:%=-c%) $(ARGS)
+$(FATE_FFT-yes): REF = /dev/null
 
 define DEF_FFT_FIXED
-FATE_FFT_FIXED += fate-fft-fixed-$(1)   fate-ifft-fixed-$(1)  \
-  fate-mdct-fixed-$(1) fate-imdct-fixed-$(1)
+FATE_FFT_FIXED-$(CONFIG_FFT)  += fate-fft-fixed-$(1)  fate-ifft-fixed-$(1)
+FATE_FFT_FIXED-$(CONFIG_MDCT) += fate-mdct-fixed-$(1) fate-imdct-fixed-$(1)
 
 fate-fft-fixed-$(1):   ARGS = -n$(1)
 fate-ifft-fixed-$(1):  ARGS = -n$(1) -i
@@ -33,10 +33,10 @@ endef
 
 $(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT_FIXED,$(N
 
-fate-fft-fixed-test: $(FATE_FFT_FIXED)
-$(FATE_FFT_FIXED): libavcodec/fft-fixed-test$(EXESUF)
-$(FATE_FFT_FIXED): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) 
$(ARGS)
-$(FATE_FFT_FIXED): REF = /dev/null
+fate-fft-fixed: $(FATE_FFT_FIXED-yes)
+$(FATE_FFT_FIXED-yes): libavcodec/fft-fixed-test$(EXESUF)
+$(FATE_FFT_FIXED-yes): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) 
$(ARGS)
+$(FATE_FFT_FIXED-yes): REF = /dev/null
 
-FATE-$(call ALLYES, AVCODEC FFT) += $(FATE_FFT) $(FATE_FFT_FIXED)
-fate-fft: $(FATE_FFT) $(FATE_FFT_FIXED)
+FATE-$(CONFIG_AVCODEC) += $(FATE_FFT-yes) $(FATE_FFT_FIXED-yes)
+fate-fft: $(FATE_FFT-yes) $(FATE_FFT_FIXED-yes)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] video4linux2: Avoid a floating point exception

2014-07-30 Thread Bernhard Übelacker 
ffmpeg | branch: release/2.2 | Bernhard Übelacker  | Sun 
Jul 27 08:38:59 2014 -0700| [b20a8ad619ac0e2631391b6311cc000de85d22bf] | 
committer: Diego Biurrun

video4linux2: Avoid a floating point exception

This avoids a segfault in avconv_opt.c:opt_target when trying to
determine the norm.

(cherry picked from commit dc71f1958846bb1d96de43a4603983dc8450cfcc)
Signed-off-by: Diego Biurrun 

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

 avconv_opt.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/avconv_opt.c b/avconv_opt.c
index d62d11f..73d283a 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -1726,7 +1726,8 @@ static int opt_target(void *optctx, const char *opt, 
const char *arg)
 for (j = 0; j < nb_input_files; j++) {
 for (i = 0; i < input_files[j]->nb_streams; i++) {
 AVCodecContext *c = input_files[j]->ctx->streams[i]->codec;
-if (c->codec_type != AVMEDIA_TYPE_VIDEO)
+if (c->codec_type != AVMEDIA_TYPE_VIDEO ||
+!c->time_base.num)
 continue;
 fr = c->time_base.den * 1000 / c->time_base.num;
 if (fr == 25000) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] MAINTAINERS: update list of releases i maintain

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.3 | Michael Niedermayer  | Mon Jul 
28 06:16:34 2014 +0200| [ea5bb5613f7f64b7c7865265d8760035434ed56e] | committer: 
Michael Niedermayer

MAINTAINERS: update list of releases i maintain

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 5003b8b9c3bacc4e542c923a7766c2ff46e0b1e8)

Signed-off-by: Michael Niedermayer 

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

 MAINTAINERS |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 3843772..41f40e7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -528,8 +528,8 @@ x86 Michael Niedermayer
 Releases
 
 
+2.3 Michael Niedermayer
 2.2 Michael Niedermayer
-2.1 Michael Niedermayer
 1.2 Michael Niedermayer
 
 If you want to maintain an older release, please contact us

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] fate: support testing of release branches

2014-07-30 Thread Janne Grunau 
ffmpeg | branch: release/2.3 | Janne Grunau  | Sat Jul 
26 23:29:46 2014 +0200| [6a250c858ebbb9d5111c5b14d8d46d41bd08e218] | committer: 
Michael Niedermayer

fate: support testing of release branches

Adding 'branch=release/2.3' to the fate config file will check the
release/2.3 branch instead of master. If no branch is specified it will
use 'master' so that existing config are still valid.

(cherry picked from commit 42eb9154a83e9a7aedb1168b2f1112af765cf2b5)

Conflicts:

tests/fate.sh

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

 tests/fate.sh |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/fate.sh b/tests/fate.sh
index ca3caa3..5a78018 100755
--- a/tests/fate.sh
+++ b/tests/fate.sh
@@ -19,6 +19,8 @@ test -n "$slot"|| die "slot not specified"
 test -n "$repo"|| die "repo not specified"
 test -d "$samples" || die "samples location not specified"
 
+: ${branch:=master}
+
 lock(){
 lock=$1/fate.lock
 (set -C; exec >$lock) 2>/dev/null || return
@@ -28,14 +30,14 @@ lock(){
 checkout(){
 case "$repo" in
 file:*|/*) src="${repo#file:}"  ;;
-git:*) git clone --quiet "$repo" "$src" ;;
+git:*) git clone --quiet --branch "$branch" "$repo" "$src" ;;
 esac
 }
 
 update()(
 cd ${src} || return
 case "$repo" in
-git:*) git fetch --force && git reset --hard FETCH_HEAD ;;
+git:*) git fetch --force && git reset --hard "origin/$branch" ;;
 esac
 )
 
@@ -82,6 +84,7 @@ clean(){
 report(){
 date=$(date -u +%Y%m%d%H%M%S)
 echo "fate:0:${date}:${slot}:${version}:$1:$2:${comment}" >report
+#echo "fate:1:${date}:${slot}:${version}:$1:$2:${branch}:${comment}" 
>report
 cat ${build}/config.fate >>report
 cat ${build}/tests/data/fate/*.rep >>report || for i in 
${build}/tests/data/fate/*.rep ; do cat "$i" >>report ; done
 test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] tests/fate.sh: If cat *.rep fails try it with a for loop.

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.3 | Michael Niedermayer  | Mon Jul 
28 18:27:17 2014 +0200| [5411040802ac5009f42e7cff9f40eba0788ee54f] | committer: 
Michael Niedermayer

tests/fate.sh: If cat *.rep fails try it with a for loop.

Fixes fate on haiku, where cat dies due to too many arguments
xargs could be used too but we do not use xargs currently so it
would be an additional dependency.

Also the plain cat is left in place as it is faster than the loop

Signed-off-by: Michael Niedermayer 
(cherry picked from commit d554d004a67c30e3f38bec51b2c691cfe3af3bb8)

Conflicts:

tests/fate.sh

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

 tests/fate.sh |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/fate.sh b/tests/fate.sh
index 38458c7..ca3caa3 100755
--- a/tests/fate.sh
+++ b/tests/fate.sh
@@ -82,7 +82,8 @@ clean(){
 report(){
 date=$(date -u +%Y%m%d%H%M%S)
 echo "fate:0:${date}:${slot}:${version}:$1:$2:${comment}" >report
-cat ${build}/config.fate ${build}/tests/data/fate/*.rep >>report
+cat ${build}/config.fate >>report
+cat ${build}/tests/data/fate/*.rep >>report || for i in 
${build}/tests/data/fate/*.rep ; do cat "$i" >>report ; done
 test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avdevice/pulse_audio_enc: use getter function for AVFrame.channels

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.3 | Michael Niedermayer  | Mon Jul 
28 20:06:11 2014 +0200| [de9d3f22f06edcda10903083d687ddcc039e8146] | committer: 
Michael Niedermayer

avdevice/pulse_audio_enc: use getter function for AVFrame.channels

This is required by the API/ABI for things outside libavutil

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 1e51af13c7538f427e8a0cf0e498263de674c70e)

Signed-off-by: Michael Niedermayer 

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

 libavdevice/pulse_audio_enc.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c
index b07d4c0..bc4d1f0 100644
--- a/libavdevice/pulse_audio_enc.c
+++ b/libavdevice/pulse_audio_enc.c
@@ -681,7 +681,7 @@ static int pulse_write_frame(AVFormatContext *h, int 
stream_index,
AVERROR(EINVAL) : 0;
 
 pkt.data = (*frame)->data[0];
-pkt.size = (*frame)->nb_samples * 
av_get_bytes_per_sample((*frame)->format) * (*frame)->channels;
+pkt.size = (*frame)->nb_samples * 
av_get_bytes_per_sample((*frame)->format) * av_frame_get_channels(*frame);
 pkt.dts  = (*frame)->pkt_dts;
 pkt.duration = av_frame_get_pkt_duration(*frame);
 return pulse_write_packet(h, &pkt);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] g2meet: allow size changes within original sizes

2014-07-30 Thread Vittorio Giovara 
ffmpeg | branch: release/2.3 | Vittorio Giovara  | 
Tue Jul 15 15:22:11 2014 -0400| [ab1ea597bd69d0d13f655c8934e3fa9c772a0a8d] | 
committer: Michael Niedermayer

g2meet: allow size changes within original sizes

(cherry picked from commit 14b4e64eabc84c5a5e57c8ccc56bbeb95380823b)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/g2meet.c |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 60c48c3..1004e19 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -90,6 +90,7 @@ typedef struct G2MContext {
 
 intcompression;
 intwidth, height, bpp;
+intorig_width, orig_height;
 inttile_width, tile_height;
 inttiles_x, tiles_y, tile_x, tile_y;
 
@@ -712,8 +713,8 @@ static int g2m_decode_frame(AVCodecContext *avctx, void 
*data,
 }
 c->width  = bytestream2_get_be32(&bc);
 c->height = bytestream2_get_be32(&bc);
-if (c->width  < 16 || c->width  > avctx->width ||
-c->height < 16 || c->height > avctx->height) {
+if (c->width  < 16 || c->width  > c->orig_width ||
+c->height < 16 || c->height > c->orig_height) {
 av_log(avctx, AV_LOG_ERROR,
"Invalid frame dimensions %dx%d\n",
c->width, c->height);
@@ -882,6 +883,10 @@ static av_cold int g2m_decode_init(AVCodecContext *avctx)
 
 avctx->pix_fmt = AV_PIX_FMT_RGB24;
 
+// store original sizes and check against those if resize happens
+c->orig_width  = avctx->width;
+c->orig_height = avctx->height;
+
 return 0;
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/avdct: Add avcodec_dct_get_class()

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.3 | Michael Niedermayer  | Mon Jul 
28 05:14:39 2014 +0200| [c61ac696e56acb317ff4165dd0afaa12e9f8afe3] | committer: 
Michael Niedermayer

avcodec/avdct: Add avcodec_dct_get_class()

This should have been in the initial commit of AVDCT

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 2f717be22a933fc8f53b2cb2540ffb3358896467)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/avdct.c |5 +
 libavcodec/avdct.h |2 ++
 2 files changed, 7 insertions(+)

diff --git a/libavcodec/avdct.c b/libavcodec/avdct.c
index 720e772..58f4974 100644
--- a/libavcodec/avdct.c
+++ b/libavcodec/avdct.c
@@ -70,6 +70,11 @@ static const AVClass avdct_class = {
 .version = LIBAVUTIL_VERSION_INT,
 };
 
+const AVClass *avcodec_dct_get_class(void)
+{
+return &avdct_class;
+}
+
 AVDCT *avcodec_dct_alloc(void)
 {
 AVDCT *dsp = av_mallocz(sizeof(AVDCT));
diff --git a/libavcodec/avdct.h b/libavcodec/avdct.h
index 4d691e0..4c9d00f 100644
--- a/libavcodec/avdct.h
+++ b/libavcodec/avdct.h
@@ -73,4 +73,6 @@ typedef struct AVDCT {
 AVDCT *avcodec_dct_alloc(void);
 int avcodec_dct_init(AVDCT *);
 
+const AVClass *avcodec_dct_get_class(void);
+
 #endif /* AVCODEC_AVDCT_H */

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] update for FFmpeg 2.3.1

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.3 | Michael Niedermayer  | Wed Jul 
30 23:14:25 2014 +0200| [64bbbcd7b076c2b4c87e728c2b723c6906079ed5] | committer: 
Michael Niedermayer

update for FFmpeg 2.3.1

Signed-off-by: Michael Niedermayer 

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

 RELEASE  |2 +-
 doc/Doxyfile |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE b/RELEASE
index bb576db..2bf1c1c 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-2.3
+2.3.1
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 7b2a785..e707528 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME   = FFmpeg
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 2.3
+PROJECT_NUMBER = 2.3.1
 
 # With the PROJECT_LOGO tag one can specify a logo or icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011'

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Jul 30 
23:34:18 2014 +0200| [a99de9ca2ccbe5f70f887982a909f95820cd1cbf] | committer: 
Michael Niedermayer

Merge commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011'

* commit 'a0ce85ac7de098d3f9b53b51b77a09bad700a011':
  configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled

Merged-by: Michael Niedermayer 

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



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled

2014-07-30 Thread Diego Biurrun 
ffmpeg | branch: master | Diego Biurrun  | Wed Jul 30 
05:10:18 2014 -0700| [a0ce85ac7de098d3f9b53b51b77a09bad700a011] | committer: 
Diego Biurrun

configure: Globally add ZLIB_CONST to CPPFLAGS if zlib is enabled

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

 configure |2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure b/configure
index 800d6fa..03742f0 100755
--- a/configure
+++ b/configure
@@ -4442,6 +4442,8 @@ for thread in $THREADS_LIST; do
 fi
 done
 
+enabled zlib && add_cppflags -DZLIB_CONST
+
 # conditional library dependencies, in linking order
 enabled movie_filter&& prepend avfilter_deps "avformat avcodec"
 enabled resample_filter && prepend avfilter_deps "avresample"

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/hlsenc: add some empty lines to make the code easier to read

2014-07-30 Thread Nicolas Martyanoff 
ffmpeg | branch: master | Nicolas Martyanoff  | Fri Jul 18 
10:57:42 2014 +0200| [467e9d618685212d5b8d8f0c71d7b459ce6cc3a2] | committer: 
Michael Niedermayer

avformat/hlsenc: add some empty lines to make the code easier to read

Signed-off-by: Michael Niedermayer 

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

 libavformat/hlsenc.c |7 +++
 1 file changed, 7 insertions(+)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 881c284..11f1e5b 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -34,6 +34,7 @@
 typedef struct HLSSegment {
 char filename[1024];
 double duration; /* in seconds */
+
 struct HLSSegment *next;
 } HLSSegment;
 
@@ -43,20 +44,26 @@ typedef struct HLSContext {
 int64_t sequence;
 int64_t start_sequence;
 AVOutputFormat *oformat;
+
 AVFormatContext *avf;
+
 float time;// Set by a private option.
 int max_nb_segments;   // Set by a private option.
 int  wrap; // Set by a private option.
+
 int64_t recording_time;
 int has_video;
 int64_t start_pts;
 int64_t end_pts;
 double duration;  // last segment duration computed so far, in seconds
 int nb_entries;
+
 HLSSegment *segments;
 HLSSegment *last_segment;
+
 char *basename;
 char *baseurl;
+
 AVIOContext *pb;
 } HLSContext;
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/hlsenc: rename some identifers to make the code easier to read

2014-07-30 Thread Nicolas Martyanoff 
ffmpeg | branch: master | Nicolas Martyanoff  | Fri Jul 18 
10:57:42 2014 +0200| [706fcffce138df5fa5cf28b11c773bc91ee03965] | committer: 
Michael Niedermayer

avformat/hlsenc: rename some identifers to make the code easier to read

Signed-off-by: Michael Niedermayer 

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

 libavformat/hlsenc.c |   54 +-
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index a1e3f72..881c284 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -31,11 +31,11 @@
 #include "avformat.h"
 #include "internal.h"
 
-typedef struct ListEntry {
-char  name[1024];
+typedef struct HLSSegment {
+char filename[1024];
 double duration; /* in seconds */
-struct ListEntry *next;
-} ListEntry;
+struct HLSSegment *next;
+} HLSSegment;
 
 typedef struct HLSContext {
 const AVClass *class;  // Class for private options.
@@ -45,7 +45,7 @@ typedef struct HLSContext {
 AVOutputFormat *oformat;
 AVFormatContext *avf;
 float time;// Set by a private option.
-int  size; // Set by a private option.
+int max_nb_segments;   // Set by a private option.
 int  wrap; // Set by a private option.
 int64_t recording_time;
 int has_video;
@@ -53,8 +53,8 @@ typedef struct HLSContext {
 int64_t end_pts;
 double duration;  // last segment duration computed so far, in seconds
 int nb_entries;
-ListEntry *list;
-ListEntry *end_list;
+HLSSegment *segments;
+HLSSegment *last_segment;
 char *basename;
 char *baseurl;
 AVIOContext *pb;
@@ -86,28 +86,28 @@ static int hls_mux_init(AVFormatContext *s)
 }
 
 /* Create a new segment and append it to the segment list */
-static int append_entry(HLSContext *hls, double duration)
+static int hls_append_segment(HLSContext *hls, double duration)
 {
-ListEntry *en = av_malloc(sizeof(*en));
+HLSSegment *en = av_malloc(sizeof(*en));
 
 if (!en)
 return AVERROR(ENOMEM);
 
-av_strlcpy(en->name, av_basename(hls->avf->filename), sizeof(en->name));
+av_strlcpy(en->filename, av_basename(hls->avf->filename), 
sizeof(en->filename));
 
 en->duration = duration;
 en->next = NULL;
 
-if (!hls->list)
-hls->list = en;
+if (!hls->segments)
+hls->segments = en;
 else
-hls->end_list->next = en;
+hls->last_segment->next = en;
 
-hls->end_list = en;
+hls->last_segment = en;
 
-if (hls->size && hls->nb_entries >= hls->size) {
-en = hls->list;
-hls->list = en->next;
+if (hls->max_nb_segments && hls->nb_entries >= hls->max_nb_segments) {
+en = hls->segments;
+hls->segments = en->next;
 av_free(en);
 } else
 hls->nb_entries++;
@@ -117,9 +117,9 @@ static int append_entry(HLSContext *hls, double duration)
 return 0;
 }
 
-static void free_entries(HLSContext *hls)
+static void hls_free_segments(HLSContext *hls)
 {
-ListEntry *p = hls->list, *en;
+HLSSegment *p = hls->segments, *en;
 
 while(p) {
 en = p;
@@ -131,7 +131,7 @@ static void free_entries(HLSContext *hls)
 static int hls_window(AVFormatContext *s, int last)
 {
 HLSContext *hls = s->priv_data;
-ListEntry *en;
+HLSSegment *en;
 int target_duration = 0;
 int ret = 0;
 int64_t sequence = FFMAX(hls->start_sequence, hls->sequence - 
hls->nb_entries);
@@ -140,7 +140,7 @@ static int hls_window(AVFormatContext *s, int last)
   &s->interrupt_callback, NULL)) < 0)
 goto fail;
 
-for (en = hls->list; en; en = en->next) {
+for (en = hls->segments; en; en = en->next) {
 if (target_duration < en->duration)
 target_duration = ceil(en->duration);
 }
@@ -153,11 +153,11 @@ static int hls_window(AVFormatContext *s, int last)
 av_log(s, AV_LOG_VERBOSE, "EXT-X-MEDIA-SEQUENCE:%"PRId64"\n",
sequence);
 
-for (en = hls->list; en; en = en->next) {
+for (en = hls->segments; en; en = en->next) {
 avio_printf(hls->pb, "#EXTINF:%f,\n", en->duration);
 if (hls->baseurl)
 avio_printf(hls->pb, "%s", hls->baseurl);
-avio_printf(hls->pb, "%s\n", en->name);
+avio_printf(hls->pb, "%s\n", en->filename);
 }
 
 if (last)
@@ -282,7 +282,7 @@ static int hls_write_packet(AVFormatContext *s, AVPacket 
*pkt)
 
 if (can_split && av_compare_ts(pkt->pts - hls->start_pts, st->time_base,
end_pts, AV_TIME_BASE_Q) >= 0) {
-ret = append_entry(hls, hls->duration);
+ret = hls_append_segment(hls, hls->duration);
 if (ret)
 return ret;
 
@@ -317,10 +317,10 @@ static int hls_write_trailer(struct AVFormatContext *s)
 avio_closep(&oc->pb);
 avformat_free_context(oc);
 av_free(hls->basen

[FFmpeg-cvslog] avformat/hlsenc: Add some comments to make the code easier to read

2014-07-30 Thread Nicolas Martyanoff 
ffmpeg | branch: master | Nicolas Martyanoff  | Fri Jul 18 
10:57:42 2014 +0200| [53f10e03687c56b7f3b36f7d7c07d9934b53d4ad] | committer: 
Michael Niedermayer

avformat/hlsenc: Add some comments to make the code easier to read

Signed-off-by: Michael Niedermayer 

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

 libavformat/hlsenc.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index 76a7eef..a1e3f72 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -33,7 +33,7 @@
 
 typedef struct ListEntry {
 char  name[1024];
-double   duration;
+double duration; /* in seconds */
 struct ListEntry *next;
 } ListEntry;
 
@@ -85,6 +85,7 @@ static int hls_mux_init(AVFormatContext *s)
 return 0;
 }
 
+/* Create a new segment and append it to the segment list */
 static int append_entry(HLSContext *hls, double duration)
 {
 ListEntry *en = av_malloc(sizeof(*en));

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc: add very basic libcdio documentation

2014-07-30 Thread Gerion Entrup 
ffmpeg | branch: master | Gerion Entrup  | Wed Jul 
30 01:53:32 2014 +0200| [dc315cdb4ecffb7ec4d3496f1d0c8d0c123f0a7b] | committer: 
Michael Niedermayer

doc: add very basic libcdio documentation

Signed-off-by: Michael Niedermayer 

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

 doc/indevs.texi |   15 +++
 1 file changed, 15 insertions(+)

diff --git a/doc/indevs.texi b/doc/indevs.texi
index 4ca12ff..e0e7e67 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -483,6 +483,21 @@ ffplay -f lavfi 
"movie=test.avi[out0];amovie=test.wav[out1]"
 
 @end itemize
 
+@section libcdio
+
+Audio-CD input device based on cdio.
+
+To enable this input device during configuration you need libcdio
+installed on your system.
+
+This device allows playing and grabbing from an Audio-CD.
+
+For example to copy with @command{ffmpeg} the entire Audio-CD in /dev/sr0,
+you may run the command:
+@example
+ffmpeg -f libcdio -i /dev/sr0 cd.wav
+@end example
+
 @section libdc1394
 
 IIDC1394 input device, based on libdc1394 and libraw1394.

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc: add very basic libcdio documentation

2014-07-30 Thread Gerion Entrup 
ffmpeg | branch: release/2.3 | Gerion Entrup  | Wed 
Jul 30 01:53:32 2014 +0200| [1f58590e1e1793133b4558d475a26497d5400373] | 
committer: Michael Niedermayer

doc: add very basic libcdio documentation

Signed-off-by: Michael Niedermayer 
(cherry picked from commit dc315cdb4ecffb7ec4d3496f1d0c8d0c123f0a7b)

Signed-off-by: Michael Niedermayer 

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

 doc/indevs.texi |   15 +++
 1 file changed, 15 insertions(+)

diff --git a/doc/indevs.texi b/doc/indevs.texi
index 4205808..5cac07f 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -483,6 +483,21 @@ ffplay -f lavfi 
"movie=test.avi[out0];amovie=test.wav[out1]"
 
 @end itemize
 
+@section libcdio
+
+Audio-CD input device based on cdio.
+
+To enable this input device during configuration you need libcdio
+installed on your system.
+
+This device allows playing and grabbing from an Audio-CD.
+
+For example to copy with @command{ffmpeg} the entire Audio-CD in /dev/sr0,
+you may run the command:
+@example
+ffmpeg -f libcdio -i /dev/sr0 cd.wav
+@end example
+
 @section libdc1394
 
 IIDC1394 input device, based on libdc1394 and libraw1394.

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Changelog: highlighting for 2.3.1

2014-07-30 Thread Michael Niedermayer 
ffmpeg | branch: release/2.3 | Michael Niedermayer  | Thu Jul 
31 03:11:40 2014 +0200| [7c2d152f562ab089ecf8262438e2f8e9cb9c546f] | committer: 
Michael Niedermayer

Changelog: highlighting for 2.3.1

Suggested-by: Timothy Gu 
Signed-off-by: Michael Niedermayer 

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

 Changelog |5 +
 1 file changed, 5 insertions(+)

diff --git a/Changelog b/Changelog
index 07cf1cf..2faa83f 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,11 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
+version 2.3.1:
+- public AVDCT API/ABI for DCT functions
+- g2meet: allow size changes within original sizes
+- dv: improved error resilience, fixing Ticket2340 and Ticket2341
+
 version 2.3:
 - AC3 fixed-point decoding
 - shuffleplanes filter

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Tag n2.3.1 : FFmpeg 2.3.1 release

2014-07-30 Thread git 
[ffmpeg] [branch: refs/tags/n2.3.1]
Tag:9a95db07de1e56fef93a12d554c70ce4bcb8e411
> http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=9a95db07de1e56fef93a12d554c70ce4bcb8e411

Tagger: Michael Niedermayer 
Date:   Thu Jul 31 03:37:01 2014 +0200

FFmpeg 2.3.1 release
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 74b8152 web/download: add FFmpeg 2.3.1

2014-07-30 Thread gitolite 
The branch, master has been updated
   via  74b8152769b1e0f89e50be186612dd11ba9448eb (commit)
  from  00b72f63772b7cb60f0e0f8105049827d0ea2d04 (commit)


- Log -
commit 74b8152769b1e0f89e50be186612dd11ba9448eb
Author: Michael Niedermayer 
AuthorDate: Thu Jul 31 03:41:03 2014 +0200
Commit: Michael Niedermayer 
CommitDate: Thu Jul 31 03:41:26 2014 +0200

web/download: add FFmpeg 2.3.1

Signed-off-by: Michael Niedermayer 

diff --git a/src/download b/src/download
index 01ba6d6..18c5472 100644
--- a/src/download
+++ b/src/download
@@ -1,10 +1,10 @@
 
 
   
-http://ffmpeg.org/releases/ffmpeg-2.3.tar.bz2"; class="btn 
btn-success">
+http://ffmpeg.org/releases/ffmpeg-2.3.1.tar.bz2"; class="btn 
btn-success">
   
   Download
-  ffmpeg-2.3.tar.bz2
+  ffmpeg-2.3.1.tar.bz2
 
 
 More releases
@@ -255,10 +255,10 @@
 
 
   
-FFmpeg 2.3 "Mandelbrot"
+FFmpeg 2.3.1 "Mandelbrot"
 
   
-2.3 was released on 2014-07-16. It is the latest stable FFmpeg release
+2.3.1 was released on 2014-07-31. It is the latest stable FFmpeg release
 from the 2.3 release branch, which was cut from master on 2014-07-16.
 Amongst lots of other changes, it includes all changes from
 ffmpeg-mt, libav master of 2014-07-15, libav 10.2 as of 2014-07-15.
@@ -277,15 +277,15 @@ libpostproc52.  3.100
 
   
 
-  Download 
bzip2 tarball
-  PGP 
signature
+  Download 
bzip2 tarball
+  PGP 
signature
  
 
-  Download 
gzip tarball
-  PGP signature
+  Download 
gzip tarball
+  PGP 
signature
  
 
-  http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.3";>Changelog
+  http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.3.1";>Changelog
   http://git.videolan.org/?p=ffmpeg.git;a=blob;f=RELEASE_NOTES;hb=489d066";>Release
 Notes
  


---

Summary of changes:
 src/download |   18 +-
 1 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog