gmane.comp.video.ffmpeg.cvs

doc/encoders: Add libopencore-amrnb doc

Timothy Gu — 2013-06-19T00:01:01

ffmpeg | branch: master | Timothy Gu <timothygu99< at >gmail.com> | Mon Jun 17 17:38:38 2013 -0700| [9ead06057acfcc43bcb99a63a7c58543007b2847] | committer: Michael Niedermayer

doc/encoders: Add libopencore-amrnb doc

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

---

 doc/encoders.texi |   37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/doc/encoders.texi b/doc/encoders.texi
index 0245693..184de80 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
< at >< at > -592,6 +592,43 < at >< at > default value is 0 (disabled).
 
 < at >end table
 
+< at >section libopencore-amrnb
+
+OpenCORE Adaptive Multi-Rate Narrowband encoder.
+
+Requires the presence of the libopencore-amrnb headers and library during
+configuration. You need to explicitly configure the build with
+< at >code{--enable-libopencore-amrnb --enable-version3}.
+
+This is a mono-only encoder. Officially it only supports 8000Hz sample rate,
+but you can override it by setting < at >option{strict} to < at >samp{unofficial} or
+lower.
+
+< at >subsection

Merge branch 'frame_num_offset' ofhttps://github.com/mjmvisser/FFmpeg

Michael Niedermayer — 2013-06-18T23:37:58

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Wed Jun 19 01:25:32 2013 +0200| [602d0bfe67ce20e169433ca583153e5c01c84016] | committer: Michael Niedermayer

Merge branch 'frame_num_offset' of https://github.com/mjmvisser/FFmpeg

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

---

added start_number parameter to drawtext to permitan offset to n/ frame_num var

Mark Visser — 2013-06-18T23:37:58

ffmpeg | branch: master | Mark Visser <mjmvisser< at >gmail.com> | Tue May 21 16:14:46 2013 -0400| [0defc77e9deb081c11c4b5cc44891c712e07b92b] | committer: Mark Visser

added start_number parameter to drawtext to permit an offset to n/frame_num var

---

 doc/filters.texi          |    4 ++++
 libavfilter/vf_drawtext.c |    4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 6e616b2..694e5a1 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
< at >< at > -3068,6 +3068,10 < at >< at > The x and y offsets for the text shadow position with respect to the
 position of the text. They can be either positive or negative
 values. Default value for both is "0".
 
+< at >item start_number
+The starting frame number for the n/frame_num variable. The default value
+is "0".
+
 < at >item tabsize
 The size in number of spaces to use for rendering the tab.
 Default value is 4.
diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index 157bfc7..fcdf53a 100644
--- a/libavfilter/vf_draw

add the start_number offset to var_values[VAR_N]directly, instead of adding it in func_frame_num

Mark Visser — 2013-06-18T23:37:58

ffmpeg | branch: master | Mark Visser <mjmvisser< at >gmail.com> | Tue Jun 18 17:38:17 2013 -0400| [2090abcc436df92969634577c91ea1d1143d4533] | committer: Mark Visser

add the start_number offset to var_values[VAR_N] directly, instead of adding it in func_frame_num

---

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

diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
index fcdf53a..7cafafe 100644
--- a/libavfilter/vf_drawtext.c
+++ b/libavfilter/vf_drawtext.c
< at >< at > -616,7 +616,7 < at >< at > static int func_frame_num(AVFilterContext *ctx, AVBPrint *bp,
 {
     DrawTextContext *s = ctx->priv;
 
-    av_bprintf(bp, "%d", (int)s->var_values[VAR_N]+s->start_number);
+    av_bprintf(bp, "%d", (int)s->var_values[VAR_N]);
     return 0;
 }
 
< at >< at > -980,7 +980,7 < at >< at > static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
         if ((ret = load_textfile(ctx)) < 0)
             return ret;
 
-    s->var_values[VAR_N] = inlink->frame_count;
+    s->var_values[VAR_N] = inlink-

ff_gen_search: make step 64 bit to preventhypothetical integer overflow

Michael Niedermayer — 2013-06-18T21:56:49

ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 20:47:07 2013 +0200| [04d69466003ff9496a8238d5d5e8714759662112] | committer: Carl Eugen Hoyos

ff_gen_search: make step 64 bit to prevent hypothetical integer overflow

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>
(cherry picked from commit 9d73e302537144877ca9d5b648b21aca28b78f4f)

---

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 7383cde..1ba9258 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
< at >< at > -1859,7 +1859,7 < at >< at > int64_t ff_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts,
     }
 
     if(ts_max == AV_NOPTS_VALUE){
-        int step= 1024;
+        int64_t step= 1024;
         filesize = avio_size(s->pb);
         pos_max = filesize - 1;
         do{

ff_gen_search: fix infinite loop

Michael Niedermayer — 2013-06-18T21:56:49

ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 20:50:15 2013 +0200| [c0445df5b35947cf40abcb15ce6b39e404e20799] | committer: Carl Eugen Hoyos

ff_gen_search: fix infinite loop

Fixes Ticket2639

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>
(cherry picked from commit f8ca8138f01d0a7d96d4e1ea65fecd1197f96206)

---

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d9c95cf..ed83f28 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
< at >< at > -1868,7 +1868,7 < at >< at > int64_t ff_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts,
             pos_max = FFMAX(0, pos_max - step);
             ts_max = ff_read_timestamp(s, stream_index, &pos_max, limit, read_timestamp);
             step += step;
-        }while(ts_max == AV_NOPTS_VALUE && pos_max > 0);
+        }while(ts_max == AV_NOPTS_VALUE && 2*limit > step);
         if (ts_max == AV_NOPTS_VALUE)
             return -1

ff_gen_search: fix limit

Michael Niedermayer — 2013-06-18T21:56:49

ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 20:48:53 2013 +0200| [c77b3737b9d1bdc27a7ac9ae8d5655c5bb000304] | committer: Carl Eugen Hoyos

ff_gen_search: fix limit

The limit value could become slightly wrong in the last iteration

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>
(cherry picked from commit b3dd50cd0dbbda08610b75384128f5f47f5199d9)

---

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1ba9258..d9c95cf 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
< at >< at > -1860,11 +1860,13 < at >< at > int64_t ff_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts,
 
     if(ts_max == AV_NOPTS_VALUE){
         int64_t step= 1024;
+        int64_t limit;
         filesize = avio_size(s->pb);
         pos_max = filesize - 1;
         do{
+            limit = pos_max;
             pos_max = FFMAX(0, pos_max - step);
-            ts_max = ff_read_timestamp(s, strea

ff_gen_search: fix infinite loop

Michael Niedermayer — 2013-06-18T20:59:21

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 20:50:15 2013 +0200| [f8ca8138f01d0a7d96d4e1ea65fecd1197f96206] | committer: Michael Niedermayer

ff_gen_search: fix infinite loop

Fixes Ticket2639

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

---

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 686374d..ce92af6 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
< at >< at > -1778,7 +1778,7 < at >< at > int64_t ff_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts,
             pos_max = FFMAX(0, pos_max - step);
             ts_max = ff_read_timestamp(s, stream_index, &pos_max, limit, read_timestamp);
             step += step;
-        }while(ts_max == AV_NOPTS_VALUE && pos_max > 0);
+        }while(ts_max == AV_NOPTS_VALUE && 2*limit > step);
         if (ts_max == AV_NOPTS_VALUE)
             return -1;

ff_gen_search: fix limit

Michael Niedermayer — 2013-06-18T20:59:21

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 20:48:53 2013 +0200| [b3dd50cd0dbbda08610b75384128f5f47f5199d9] | committer: Michael Niedermayer

ff_gen_search: fix limit

The limit value could become slightly wrong in the last iteration

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

---

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9d9d3d6..686374d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
< at >< at > -1770,11 +1770,13 < at >< at > int64_t ff_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts,
 
     if(ts_max == AV_NOPTS_VALUE){
         int64_t step= 1024;
+        int64_t limit;
         filesize = avio_size(s->pb);
         pos_max = filesize - 1;
         do{
+            limit = pos_max;
             pos_max = FFMAX(0, pos_max - step);
-            ts_max = ff_read_timestamp(s, stream_index, &pos_max, pos_max + step, read_timestamp);
+            ts_max

ff_gen_search: make step 64it to preventhypothetical integer overflow

Michael Niedermayer — 2013-06-18T20:59:20

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 20:47:07 2013 +0200| [9d73e302537144877ca9d5b648b21aca28b78f4f] | committer: Michael Niedermayer

ff_gen_search: make step 64it to prevent hypothetical integer overflow

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

---

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 68c0263..9d9d3d6 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
< at >< at > -1769,7 +1769,7 < at >< at > int64_t ff_gen_search(AVFormatContext *s, int stream_index, int64_t target_ts,
     }
 
     if(ts_max == AV_NOPTS_VALUE){
-        int step= 1024;
+        int64_t step= 1024;
         filesize = avio_size(s->pb);
         pos_max = filesize - 1;
         do{

doc/decoders: Document libcelt

Timothy Gu — 2013-06-18T16:24:50

ffmpeg | branch: master | Timothy Gu <timothygu99< at >gmail.com> | Mon Jun 17 17:42:08 2013 -0700| [e3580449221c79cf611995dc7e2fcb61dd867d4c] | committer: Michael Niedermayer

doc/decoders: Document libcelt

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

---

 doc/decoders.texi |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/decoders.texi b/doc/decoders.texi
index 2d812a2..7d639b9 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
< at >< at > -60,6 +60,14 < at >< at > This decoder generates wave patterns according to predefined sequences. Its
 use is purely internal and the format of the data it accepts is not publicly
 documented.
 
+< at >section libcelt
+
+libcelt decoder wrapper
+
+libcelt allows libavcodec to decode the Xiph CELT ultra-low delay audio codec.
+Requires the presence of the libcelt headers and library during configuration.
+You need to explicitly configure the build with < at >code{--enable-libcelt}.
+
 < at >c man end AUDIO DECODERS
 
 < at >chapter Subtitles Decoders

Add maintainer for WebVTT demuxer and muxer

Matthew Heaney — 2013-06-18T16:24:50

ffmpeg | branch: master | Matthew Heaney <matthewjheaney< at >google.com> | Mon Jun 17 16:29:13 2013 -0700| [59b13750d2cd617049b59205d78716d3fc5afda0] | committer: Michael Niedermayer

Add maintainer for WebVTT demuxer and muxer

Matthew J Heaney is added to the list of ffmpeg maintainers, for the
WebVTT demuxer and muxer.

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

---

 MAINTAINERS |    1 +
 1 file changed, 1 insertion(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 407a6c8..48c7f08 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
< at >< at > -407,6 +407,7 < at >< at > Muxers/Demuxers:
   voc.c                                 Aurelien Jacobs
   wav.c                                 Michael Niedermayer
   wc3movie.c                            Mike Melanson
+  webvtt*                               Matthew J Heaney
   westwood.c                            Mike Melanson
   wtv.c                                 Peter Ross
   wv.c                                  Kostya Shishkov

avutil/frame: Try to align width to achivelinesize[0] alignment

Michael Niedermayer — 2013-06-18T14:58:07

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 16:39:23 2013 +0200| [9626d0e906f698504efb8652bac143b98d66b088] | committer: Michael Niedermayer

avutil/frame: Try to align width to achive linesize[0] alignment

This results in more alignment for pixel formats that have "odd" pixel
sizes like RGB24. It makes access through SIMD easier

Works around Issue described in Ticket1031

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

---

 libavutil/frame.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libavutil/frame.c b/libavutil/frame.c
index 24ad0dd..7584ae3 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
< at >< at > -126,10 +126,14 < at >< at > static int get_video_buffer(AVFrame *frame, int align)
         return ret;
 
     if (!frame->linesize[0]) {
-        ret = av_image_fill_linesizes(frame->linesize, frame->format,
-                                      frame->width);
-        if (ret < 0)
-            return ret;
+        for(i=1; i<=align; i

Merge remote-tracking branch 'qatar/master'

Michael Niedermayer — 2013-06-18T07:43:35

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 09:29:35 2013 +0200| [e41bf19d2cb0e39e65f67d45a11458751a086d8c] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: math typo in interlace filter

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

---

lavfi: math typo in interlace filter

Vittorio Giovara — 2013-06-18T07:43:35

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara< at >gmail.com> | Mon Jun 17 11:54:26 2013 +0200| [cd0faeee62ffe96f294ad3baf1b55343be63a2a7] | committer: Luca Barbato

lavfi: math typo in interlace filter

Signed-off-by: Luca Barbato <lu_zero< at >gentoo.org>

---

 libavfilter/vf_interlace.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c
index d3c3d4d..ff54896 100755
--- a/libavfilter/vf_interlace.c
+++ b/libavfilter/vf_interlace.c
< at >< at > -150,7 +150,7 < at >< at > static void copy_picture_field(AVFrame *src_frame, AVFrame *dst_frame,
                     srcp_below = srcp; // there is no line below
                 for (i = 0; i < linesize; i++) {
                     // this calculation is an integer representation of
-                    // '0.5 * current + 0.25 * above + 0.25 + below'
+                    // '0.5 * current + 0.25 * above + 0.25 * below'
                     // '1 +' is for rounding.
                     dstp[i] = (1 +

swresample/x86/audio_convert: add emms to CONV

Michael Niedermayer — 2013-06-18T00:54:52

ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 02:09:46 2013 +0200| [ae93d3405e5e3c04bad2a74b4679482666535a51] | committer: Carl Eugen Hoyos

swresample/x86/audio_convert: add emms to CONV

Fixes ticket #1874

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>
(cherry picked from commit ca2818b88155029bb6f989ee522e7f8e9e9f5927)

---

 libswresample/x86/audio_convert.asm |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm
index ad46977..4963959 100644
--- a/libswresample/x86/audio_convert.asm
+++ b/libswresample/x86/audio_convert.asm
< at >< at > -195,7 +195,12 < at >< at > cglobal %2_to_%1_%3, 3, 3, 6, dst, src, len
     add lenq, 2*mmsize/(1<<%4)
 %endif
         jl .next
+%if mmsize == 8
+    emms
+    RET
+%else
     REP_RET
+%endif
 %endmacro
 
 %macro PACK_6CH 5-7

swresample/x86/audio_convert: add emms to CONV

Michael Niedermayer — 2013-06-18T00:54:51

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 02:09:46 2013 +0200| [d9a91dfb542ae3a5b0dcf2339183ee0177b8ab16] | committer: Carl Eugen Hoyos

swresample/x86/audio_convert: add emms to CONV

Fixes ticket #1874

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>
(cherry picked from commit ca2818b88155029bb6f989ee522e7f8e9e9f5927)

---

 libswresample/x86/audio_convert.asm |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm
index ad46977..4963959 100644
--- a/libswresample/x86/audio_convert.asm
+++ b/libswresample/x86/audio_convert.asm
< at >< at > -195,7 +195,12 < at >< at > cglobal %2_to_%1_%3, 3, 3, 6, dst, src, len
     add lenq, 2*mmsize/(1<<%4)
 %endif
         jl .next
+%if mmsize == 8
+    emms
+    RET
+%else
     REP_RET
+%endif
 %endmacro
 
 %macro PACK_6CH 5-7

swresample/x86/audio_convert: add emms to CONV

Michael Niedermayer — 2013-06-18T00:54:50

ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 02:09:46 2013 +0200| [2ad70f57a88ba5fccd37c73cc63286a1d2e2a274] | committer: Carl Eugen Hoyos

swresample/x86/audio_convert: add emms to CONV

Fixes ticket #1874

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>
(cherry picked from commit ca2818b88155029bb6f989ee522e7f8e9e9f5927)

---

 libswresample/x86/audio_convert.asm |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm
index 29701a5..854f8e4 100644
--- a/libswresample/x86/audio_convert.asm
+++ b/libswresample/x86/audio_convert.asm
< at >< at > -196,7 +196,12 < at >< at > cglobal %2_to_%1_%3, 3, 3, 6, dst, src, len
     add lenq, 2*mmsize/(1<<%4)
 %endif
         jl .next
+%if mmsize == 8
+    emms
+    RET
+%else
     REP_RET
+%endif
 %endmacro
 
 %macro PACK_6CH 5-7

swresample/x86/audio_convert: add emms to CONV

Michael Niedermayer — 2013-06-18T00:54:48

ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 02:09:46 2013 +0200| [d5b068d44b4bf42951611a92d3697786564ef002] | committer: Carl Eugen Hoyos

swresample/x86/audio_convert: add emms to CONV

Fixes ticket #1874

Signed-off-by: Michael Niedermayer <michaelni< at >gmx.at>
(cherry picked from commit ca2818b88155029bb6f989ee522e7f8e9e9f5927)

---

 libswresample/x86/audio_convert.asm |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm
index 6fc86f0..d5563a2 100644
--- a/libswresample/x86/audio_convert.asm
+++ b/libswresample/x86/audio_convert.asm
< at >< at > -196,7 +196,12 < at >< at > cglobal %2_to_%1_%3, 3, 3, 6, dst, src, len
     add lenq, 2*mmsize/(1<<%4)
 %endif
         jl .next
+%if mmsize == 8
+    emms
+    RET
+%else
     REP_RET
+%endif
 %endmacro
 
 %macro PACK_6CH 5-7

swresample/x86/audio_convert: add emms to CONV

Michael Niedermayer — 2013-06-18T00:31:52

ffmpeg | branch: master | Michael Niedermayer <michaelni< at >gmx.at> | Tue Jun 18 02:09:46 2013 +0200| [ca2818b88155029bb6f989ee522e7f8e9e9f5927] | committer: Michael Niedermayer

swresample/x86/audio_convert: add emms to CONV

Might fix Ticket1874

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

---

 libswresample/x86/audio_convert.asm |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libswresample/x86/audio_convert.asm b/libswresample/x86/audio_convert.asm
index ad46977..4963959 100644
--- a/libswresample/x86/audio_convert.asm
+++ b/libswresample/x86/audio_convert.asm
< at >< at > -195,7 +195,12 < at >< at > cglobal %2_to_%1_%3, 3, 3, 6, dst, src, len
     add lenq, 2*mmsize/(1<<%4)
 %endif
         jl .next
+%if mmsize == 8
+    emms
+    RET
+%else
     REP_RET
+%endif
 %endmacro
 
 %macro PACK_6CH 5-7

vaapi: return early from ff_vaapi_render_picture()without picture

Janne Grunau — 2013-06-18T00:12:48

ffmpeg | branch: release/1.2 | Janne Grunau <janne-libav< at >jannau.net> | Tue Jun 18 01:56:06 2013 +0200| [054779625f76bcc3dea9ff1175f4eedc8847c187] | committer: Carl Eugen Hoyos

vaapi: return early from ff_vaapi_render_picture() without picture

Fixes an assertion when called on uninitialized frame. Spotted after
seeking in vlc.
Fixes ticket #2461.

Tested-by: Timo
Reviewed-by: Joakim Plate
Signed-off-by: Carl Eugen Hoyos <cehoyos< at >ag.or.at>
(cherry picked from commit 2ee380aefbb92c89e8e9c7aa5846aa404919ec7c)

---

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

diff --git a/libavcodec/vaapi.c b/libavcodec/vaapi.c
index a220a9d..94959bf 100644
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
< at >< at > -46,6 +46,9 < at >< at > int ff_vaapi_render_picture(struct vaapi_context *vactx, VASurfaceID surface)
     VABufferID va_buffers[3];
     unsigned int n_va_buffers = 0;
 
+    if (!vactx->pic_param_buf_id)
+        return 0;
+
     vaUnmapBuffer(vactx->display, vactx->pic_param_buf_id);
     va_buffers[n_va_buf