headers
Marton Balint | 1 Jul 2012 02:48
Favicon

ffplay: only configure video filters after we got the first frame

ffmpeg | branch: master | Marton Balint <cus <at> passwd.hu> | Fri Jun  8 00:16:49 2012 +0200|
[58f22f70121c2c9f4bf9935d00c7ba7948fbe5c0] | committer: Marton Balint

ffplay: only configure video filters after we got the first frame

Otherwise the codec width, height and pixel format values may not be set.

Signed-off-by: Marton Balint <cus <at> passwd.hu>

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

 ffplay.c |   33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index c01740a..164958d 100644
--- a/ffplay.c
+++ b/ffplay.c
 <at>  <at>  -1625,13 +1625,6  <at>  <at>  static int configure_video_filters(AVFilterGraph *graph, VideoState *is,
const c
     is->in_video_filter  = filt_src;
     is->out_video_filter = filt_out;

-    if (codec->codec->capabilities & CODEC_CAP_DR1) {
-        is->use_dr1 = 1;
-        codec->get_buffer     = codec_get_buffer;
-        codec->release_buffer = codec_release_buffer;
-        codec->opaque         = &is->buffer_pool;
-    }
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer | 1 Jul 2012 02:48
Favicon

Merge remote-tracking branch 'cus/stable'

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Sun Jul  1 02:44:22 2012 +0200|
[f7cba736bada4fcdd776617bf2df0b10ad8a44f8] | committer: Michael Niedermayer

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: only configure video filters after we got the first frame

Merged-by: Michael Niedermayer <michaelni <at> gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7cba736bada4fcdd776617bf2df0b10ad8a44f8
---
Permalink | Reply | 0 comments |
headers
Michael Niedermayer | 1 Jul 2012 18:06
Favicon

wmaenc: switch all remaining asserts to av_asserts

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Sun Jul  1 18:02:17 2012 +0200|
[9eb6e5cc48e5d96494fe497fb327937716ed7368] | committer: Michael Niedermayer

wmaenc: switch all remaining asserts to av_asserts

Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

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

 libavcodec/wmaenc.c |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index d3210d2..b31137a 100644
--- a/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
 <at>  <at>  -24,9 +24,6  <at>  <at> 
 #include "wma.h"
 #include "libavutil/avassert.h"

-#undef NDEBUG
-#include <assert.h>
-

 static int encode_init(AVCodecContext * avctx){
     WMACodecContext *s = avctx->priv_data;
 <at>  <at>  -67,7 +64,7  <at>  <at>  static int encode_init(AVCodecContext * avctx){
         AV_WL32(extradata, flags1);
         AV_WL16(extradata+4, flags2);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer | 1 Jul 2012 18:06
Favicon

ituh263dec: use av_assert

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Sun Jul  1 18:04:08 2012 +0200|
[91ce7c21f042edda1add197d9456e69a11a19f05] | committer: Michael Niedermayer

ituh263dec: use av_assert

Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

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

 libavcodec/ituh263dec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 141cb02..16e8e51 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
 <at>  <at>  -346,7 +346,7  <at>  <at>  static void preview_obmc(MpegEncContext *s){
         s->block_index[i]+= 1;
     s->mb_x++;

-    assert(s->pict_type == AV_PICTURE_TYPE_P);
+    av_assert2(s->pict_type == AV_PICTURE_TYPE_P);

     do{
         if (get_bits1(&s->gb)) {
Permalink | Reply | 0 comments |
headers
Stefano Sabatini | 1 Jul 2012 18:38
Favicon

lavf/segment: pass the top level chained muxer format context to segment_end()

ffmpeg | branch: master | Stefano Sabatini <stefasab <at> gmail.com> | Fri Jan 13 23:24:13 2012 +0100|
[3bee286ad280059e5aaf07d8f8a45f61964d5d79] | committer: Stefano Sabatini

lavf/segment: pass the top level chained muxer format context to segment_end()

Consistent with segment_start() and less confusing.

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

 libavformat/segment.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libavformat/segment.c b/libavformat/segment.c
index da23626..4480e4d 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
 <at>  <at>  -89,15 +89,17  <at>  <at>  fail:
     return err;
 }

-static int segment_end(AVFormatContext *oc)
+static int segment_end(AVFormatContext *s)
 {
+    SegmentContext *seg = s->priv_data;
+    AVFormatContext *oc = seg->avf;
     int ret = 0;

     if (oc->oformat->write_trailer)
         ret = oc->oformat->write_trailer(oc);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Stefano Sabatini | 1 Jul 2012 18:38
Favicon

lavf/segment: rename variable "size" to "list_size"

ffmpeg | branch: master | Stefano Sabatini <stefasab <at> gmail.com> | Sat Jan 14 00:01:05 2012 +0100|
[aa1cceb5eb7866d42d05ce22d97b06c620af18cb] | committer: Stefano Sabatini

lavf/segment: rename variable "size" to "list_size"

The new name is more meaningful/less confusing.

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

 libavformat/segment.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/segment.c b/libavformat/segment.c
index 4480e4d..a6ddf90 100644
--- a/libavformat/segment.c
+++ b/libavformat/segment.c
 <at>  <at>  -36,8 +36,8  <at>  <at>  typedef struct {
     AVFormatContext *avf;
     char *format;          /**≤ Set by a private option. */
     char *list;            /**≤ Set by a private option. */
+    int   list_size;       /**≤ Set by a private option. */
     float time;            /**≤ Set by a private option. */
-    int  size;             /**≤ Set by a private option. */
     int  wrap;             /**≤ Set by a private option. */
     int64_t offset_time;
     int64_t recording_time;
 <at>  <at>  -217,7 +217,7  <at>  <at>  static int seg_write_packet(AVFormatContext *s, AVPacket *pkt)
         if (seg->list) {
             avio_printf(seg->pb, "%s\n", oc->filename);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer | 1 Jul 2012 20:50
Favicon

h264: check log2_max_poc_lsb for validity

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Sun Jul  1 19:25:17 2012 +0200|
[0c9283a03f177f682d64ce0ecd7bf817f1a40dca] | committer: Michael Niedermayer

h264: check log2_max_poc_lsb for validity

Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

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

 libavcodec/h264_ps.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 261e2d2..98d779e 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
 <at>  <at>  -380,7 +380,12  <at>  <at>  int ff_h264_decode_seq_parameter_set(H264Context *h){
     sps->poc_type= get_ue_golomb_31(&s->gb);

     if(sps->poc_type == 0){ //FIXME #define
-        sps->log2_max_poc_lsb= get_ue_golomb(&s->gb) + 4;
+        unsigned t = get_ue_golomb(&s->gb);
+        if(t>12){
+            av_log(h->s.avctx, AV_LOG_ERROR, "log2_max_poc_lsb (%d) is out of range\n", t);
+            goto fail;
+        }
+        sps->log2_max_poc_lsb= t + 4;
     } else if(sps->poc_type == 1){//FIXME #define
         sps->delta_pic_order_always_zero_flag= get_bits1(&s->gb);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer | 1 Jul 2012 20:50
Favicon

h264: clear the ref lists when the reference are cleared.

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Sun Jul  1 20:29:52 2012 +0200|
[87b98689726360f61bacb7681a05ba677a218751] | committer: Michael Niedermayer

h264: clear the ref lists when the reference are cleared.

Fixes reading of freed arrays (Ticket1498)

Found-by: Piotr Bandurski <ami_stuff <at> o2.pl>
Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

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

 libavcodec/h264_refs.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 926a6cc..d68a7d8 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
 <at>  <at>  -443,6 +443,9  <at>  <at>  void ff_h264_remove_all_refs(H264Context *h){
         h->short_ref[i]= NULL;
     }
     h->short_ref_count=0;
+
+    memset(h->default_ref_list, 0, sizeof(h->default_ref_list));
+    memset(h->ref_list, 0, sizeof(h->ref_list));
 }

 /**
(Continue reading)

Permalink | Reply | 0 comments |
headers
Matthieu Bouron | 1 Jul 2012 21:09
Favicon

lavf/aiffdec: handle ID3 chunk

ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron <at> gmail.com> | Sat Jun 30 19:05:05 2012 +0200|
[8ac3868ff3d8d028d533bcde65d0470b48531057] | committer: Michael Niedermayer

lavf/aiffdec: handle ID3 chunk

Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

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

 libavformat/aiffdec.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 4083316..3382e8a 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
 <at>  <at>  -26,6 +26,7  <at>  <at> 
 #include "pcm.h"
 #include "aiff.h"
 #include "isom.h"
+#include "id3v2.h"

 #define AIFF                    0
 #define AIFF_C_VERSION1         0xA2805140
 <at>  <at>  -195,6 +196,7  <at>  <at>  static int aiff_read_header(AVFormatContext *s)
     AVIOContext *pb = s->pb;
     AVStream * st;
     AIFFInputContext *aiff = s->priv_data;
+    ID3v2ExtraMeta *id3v2_extra_meta = NULL;
(Continue reading)

Permalink | Reply | 0 comments |
headers
Michael Niedermayer | 1 Jul 2012 21:48
Favicon

RELEASE: update, seem this has been forgotten

ffmpeg | branch: master | Michael Niedermayer <michaelni <at> gmx.at> | Sun Jul  1 21:21:07 2012 +0200|
[c23dcd9751d44130325cd4552075957e66045f14] | committer: Michael Niedermayer

RELEASE: update, seem this has been forgotten

Signed-off-by: Michael Niedermayer <michaelni <at> gmx.at>

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

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

diff --git a/RELEASE b/RELEASE
index 8d74bcb..0a4b107 100644
--- a/RELEASE
+++ b/RELEASE
 <at>  <at>  -1 +1  <at>  <at> 
-0.10.2.git
+0.11.1.git
Permalink | Reply | 0 comments |

Gmane