[FFmpeg-cvslog] Merge commit '72d621069fc301b431fac36b5281699a362562f2'

Matthieu Bouron git at videolan.org
Thu Jun 23 22:33:50 CEST 2016


ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at stupeflix.com> | Thu Jun 23 22:30:37 2016 +0200| [7e4e8fdd34a9ff8931a44e5b6de09b0fd5cad7c1] | committer: Matthieu Bouron

Merge commit '72d621069fc301b431fac36b5281699a362562f2'

* commit '72d621069fc301b431fac36b5281699a362562f2':
  movenc: Add a missed const

Merged-by: Matthieu Bouron <matthieu.bouron at stupeflix.com>

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

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

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 0a79836..3d35477 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4249,7 +4249,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force)
     for (i = 0; i < s->nb_streams; i++) {
         MOVTrack *track = &mov->tracks[i];
         if (!track->end_reliable) {
-            AVPacket *next = ff_interleaved_peek(s, i);
+            const AVPacket *next = ff_interleaved_peek(s, i);
             if (next) {
                 track->track_duration = next->dts - track->start_dts;
                 if (next->pts != AV_NOPTS_VALUE)


======================================================================




More information about the ffmpeg-cvslog mailing list