Merge commit '04070dbca0688ab1e24528ce5c135254a9a79c47'

[ffmpeg] / libavcodec / dnxhddata.c

diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c
index b6488994d7ef4890d67d9155f5c00c8b36b39a40..ef918b0214142c55ca9eff7fabfdb3686c56bd98 100644 (file)
--- a/libavcodec/dnxhddata.c
+++ b/libavcodec/dnxhddata.c
@@ -1102,6 +1102,14 @@ int avpriv_dnxhd_get_frame_size(int cid)
     return ff_dnxhd_cid_table[i].frame_size;
 }
 
+int avpriv_dnxhd_get_interlaced(int cid)
+{
+    int i = ff_dnxhd_get_cid_table(cid);
+    if (i < 0)
+        return i;
+    return ff_dnxhd_cid_table[i].interlaced;
+}
+
 int ff_dnxhd_find_cid(AVCodecContext *avctx, int bit_depth)
 {
     int i, j;