Rollback codec tag table for mp4 muxer

- The type of changed codec tag table is different from the original's,
  it causes the crash when mp4 muxing.
- H.263 and MJPEG tags are added to mp4 codec tag table for recorder API.

Change-Id: Iee45d3982dbb3bbd5b6db5f4dc89d51aa2d29f0f
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index e0f7029..6c6275c 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -7748,6 +7748,11 @@ static const AVCodecTag codec_mp4_tags[] = {
     { AV_CODEC_ID_MPEGH_3D_AUDIO,  MKTAG('m', 'h', 'm', '1') },
     { AV_CODEC_ID_TTML,            MOV_MP4_TTML_TAG          },
     { AV_CODEC_ID_TTML,            MOV_ISMV_TTML_TAG         },
+#ifdef TIZEN_FEATURE_LIBAV
+    { AV_CODEC_ID_H263,            MKTAG('h', '2', '6', '3') },
+    { AV_CODEC_ID_H263,            MKTAG('s', '2', '6', '3') },
+    { AV_CODEC_ID_MJPEG,           MKTAG('j', 'p', 'e', 'g') },
+#endif
     { AV_CODEC_ID_NONE,               0 },
 };
 #if CONFIG_MP4_MUXER || CONFIG_PSP_MUXER
@@ -7851,11 +7856,7 @@ const AVOutputFormat ff_mp4_muxer = {
     .write_trailer     = mov_write_trailer,
     .deinit            = mov_free,
     .flags             = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE,
-#ifdef TIZEN_FEATURE_LIBAV
-    .codec_tag         = ff_codec_movvideo_tags,
-#else /* TIZEN_FEATURE_LIBAV */
     .codec_tag         = mp4_codec_tags_list,
-#endif /* TIZEN_FEATURE_LIBAV */
     .check_bitstream   = mov_check_bitstream,
     .priv_class        = &mov_isobmff_muxer_class,
 };

diff --git a/packaging/ffmpeg.spec b/packaging/ffmpeg.spec
index a4f1478..319f59a 100644 (file)
--- a/packaging/ffmpeg.spec
+++ b/packaging/ffmpeg.spec
@@ -1,7 +1,7 @@
 Name:       ffmpeg
 Summary:    AV codec lib
 Version:    5.1.2
-Release:    5
+Release:    6
 Group:      Multimedia/Libraries
 URL:        https://ffmpeg.org/
 License:    LGPL-2.1+