[FFmpeg-cvslog] avformat/mov: fix mis-detection of jpeg2000

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 17 18:56:24 2015 +0100| [13f8bbfb7051093e27ca2f4305f8a8bf88b679c9] | committer: Michael Niedermayer

avformat/mov: fix mis-detection of jpeg2000

Fixes demuxer choice for Ticket 2792

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

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

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index de4004f..1170dd4 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3664,7 +3664,9 @@ static int mov_probe(AVProbeData *p)
                  AV_RB64(p->buf+offset + 8) == 0)) {
                 score = FFMAX(score, AVPROBE_SCORE_EXTENSION);
             } else if (tag == MKTAG('f','t','y','p') &&
-                       AV_RL32(p->buf + offset + 8) == MKTAG('j','p','2',' ')) {
+                       (   AV_RL32(p->buf + offset + 8) == MKTAG('j','p','2',' ')
+                        || AV_RL32(p->buf + offset + 8) == MKTAG('j','p','x',' ')
+                    )) {
                 score = FFMAX(score, 5);
             } else {
                 score = AVPROBE_SCORE_MAX;