[FFmpeg-cvslog] avformat/movenc: Factor check_pkt() out

[Michael Niedermayer]

ffmpeg | branch: release/3.0 | Michael Niedermayer  | 
Thu Sep 15 23:52:42 2016 +0200| [a1f77124c87614b71745e08194c667fc04eaa07c] | 
committer: Michael Niedermayer

avformat/movenc: Factor check_pkt() out

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit deabcd2c05b2b01689d91394bbf3908da17234ed)
Signed-off-by: Michael Niedermayer 

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

 libavformat/movenc.c | 24 ++--
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 4e51cdf..6230f30 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4342,15 +4342,10 @@ static int mov_auto_flush_fragment(AVFormatContext *s, 
int force)
 return ret;
 }
 
-int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
+static int check_pkt(AVFormatContext *s, AVPacket *pkt)
 {
 MOVMuxContext *mov = s->priv_data;
-AVIOContext *pb = s->pb;
 MOVTrack *trk = >tracks[pkt->stream_index];
-AVCodecContext *enc = trk->enc;
-unsigned int samples_in_chunk = 0;
-int size = pkt->size, ret = 0;
-uint8_t *reformatted_data = NULL;
 
 if (trk->entry) {
 int64_t duration = pkt->dts - trk->cluster[trk->entry - 1].dts;
@@ -4374,6 +4369,23 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket 
*pkt)
 av_log(s, AV_LOG_ERROR, "Application provided duration: %"PRId64" is 
invalid\n", pkt->duration);
 return AVERROR(EINVAL);
 }
+return 0;
+}
+
+int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+MOVMuxContext *mov = s->priv_data;
+AVIOContext *pb = s->pb;
+MOVTrack *trk = >tracks[pkt->stream_index];
+AVCodecContext *enc = trk->enc;
+unsigned int samples_in_chunk = 0;
+int size = pkt->size, ret = 0;
+uint8_t *reformatted_data = NULL;
+
+ret = check_pkt(s, pkt);
+if (ret < 0)
+return ret;
+
 if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
 int ret;
 if (mov->moov_written || mov->flags & FF_MOV_FLAG_EMPTY_MOOV) {

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

[FFmpeg-cvslog] avformat/movenc: Factor check_pkt() out

[Michael Niedermayer]

ffmpeg | branch: release/3.1 | Michael Niedermayer  | 
Thu Sep 15 23:52:42 2016 +0200| [03f996d1834610bd735406aac3ee6df47a946406] | 
committer: Michael Niedermayer

avformat/movenc: Factor check_pkt() out

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit deabcd2c05b2b01689d91394bbf3908da17234ed)
Signed-off-by: Michael Niedermayer 

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

 libavformat/movenc.c | 24 ++--
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 788ab3c..917fdaf 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4592,15 +4592,10 @@ static int mov_auto_flush_fragment(AVFormatContext *s, 
int force)
 return ret;
 }
 
-int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
+static int check_pkt(AVFormatContext *s, AVPacket *pkt)
 {
 MOVMuxContext *mov = s->priv_data;
-AVIOContext *pb = s->pb;
 MOVTrack *trk = >tracks[pkt->stream_index];
-AVCodecParameters *par = trk->par;
-unsigned int samples_in_chunk = 0;
-int size = pkt->size, ret = 0;
-uint8_t *reformatted_data = NULL;
 
 if (trk->entry) {
 int64_t duration = pkt->dts - trk->cluster[trk->entry - 1].dts;
@@ -4624,6 +4619,23 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket 
*pkt)
 av_log(s, AV_LOG_ERROR, "Application provided duration: %"PRId64" is 
invalid\n", pkt->duration);
 return AVERROR(EINVAL);
 }
+return 0;
+}
+
+int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+MOVMuxContext *mov = s->priv_data;
+AVIOContext *pb = s->pb;
+MOVTrack *trk = >tracks[pkt->stream_index];
+AVCodecParameters *par = trk->par;
+unsigned int samples_in_chunk = 0;
+int size = pkt->size, ret = 0;
+uint8_t *reformatted_data = NULL;
+
+ret = check_pkt(s, pkt);
+if (ret < 0)
+return ret;
+
 if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
 int ret;
 if (mov->moov_written || mov->flags & FF_MOV_FLAG_EMPTY_MOOV) {

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

[FFmpeg-cvslog] avformat/movenc: Factor check_pkt() out

[Michael Niedermayer]

ffmpeg | branch: release/2.8 | Michael Niedermayer  | 
Thu Sep 15 23:52:42 2016 +0200| [e1ab851da65d2ca01823a8d2e4da964bc243c1f2] | 
committer: Michael Niedermayer

avformat/movenc: Factor check_pkt() out

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit deabcd2c05b2b01689d91394bbf3908da17234ed)
Signed-off-by: Michael Niedermayer 

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

 libavformat/movenc.c | 24 ++--
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 08d0c2a..4c93872 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4296,15 +4296,10 @@ static int mov_auto_flush_fragment(AVFormatContext *s)
 return ret;
 }
 
-int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
+static int check_pkt(AVFormatContext *s, AVPacket *pkt)
 {
 MOVMuxContext *mov = s->priv_data;
-AVIOContext *pb = s->pb;
 MOVTrack *trk = >tracks[pkt->stream_index];
-AVCodecContext *enc = trk->enc;
-unsigned int samples_in_chunk = 0;
-int size = pkt->size, ret = 0;
-uint8_t *reformatted_data = NULL;
 
 if (trk->entry) {
 int64_t duration = pkt->dts - trk->cluster[trk->entry - 1].dts;
@@ -4321,6 +4316,23 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket 
*pkt)
 return AVERROR(EINVAL);
 }
 }
+return 0;
+}
+
+int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+MOVMuxContext *mov = s->priv_data;
+AVIOContext *pb = s->pb;
+MOVTrack *trk = >tracks[pkt->stream_index];
+AVCodecContext *enc = trk->enc;
+unsigned int samples_in_chunk = 0;
+int size = pkt->size, ret = 0;
+uint8_t *reformatted_data = NULL;
+
+ret = check_pkt(s, pkt);
+if (ret < 0)
+return ret;
+
 if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
 int ret;
 if (mov->moov_written || mov->flags & FF_MOV_FLAG_EMPTY_MOOV) {

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

[FFmpeg-cvslog] avformat/movenc: Factor check_pkt() out

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Sep 15 23:52:42 2016 +0200| [deabcd2c05b2b01689d91394bbf3908da17234ed] | 
committer: Michael Niedermayer

avformat/movenc: Factor check_pkt() out

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

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

 libavformat/movenc.c | 24 ++--
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 319ff57..2d8fc48 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4662,15 +4662,10 @@ static int mov_auto_flush_fragment(AVFormatContext *s, 
int force)
 return ret;
 }
 
-int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
+static int check_pkt(AVFormatContext *s, AVPacket *pkt)
 {
 MOVMuxContext *mov = s->priv_data;
-AVIOContext *pb = s->pb;
 MOVTrack *trk = >tracks[pkt->stream_index];
-AVCodecParameters *par = trk->par;
-unsigned int samples_in_chunk = 0;
-int size = pkt->size, ret = 0;
-uint8_t *reformatted_data = NULL;
 
 if (trk->entry) {
 int64_t duration = pkt->dts - trk->cluster[trk->entry - 1].dts;
@@ -4694,6 +4689,23 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket 
*pkt)
 av_log(s, AV_LOG_ERROR, "Application provided duration: %"PRId64" is 
invalid\n", pkt->duration);
 return AVERROR(EINVAL);
 }
+return 0;
+}
+
+int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+MOVMuxContext *mov = s->priv_data;
+AVIOContext *pb = s->pb;
+MOVTrack *trk = >tracks[pkt->stream_index];
+AVCodecParameters *par = trk->par;
+unsigned int samples_in_chunk = 0;
+int size = pkt->size, ret = 0;
+uint8_t *reformatted_data = NULL;
+
+ret = check_pkt(s, pkt);
+if (ret < 0)
+return ret;
+
 if (mov->flags & FF_MOV_FLAG_FRAGMENT) {
 int ret;
 if (mov->moov_written || mov->flags & FF_MOV_FLAG_EMPTY_MOOV) {

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