diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 02:14:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 02:18:32 +0200 |
| commit | 069e462bebdea61d57e73099e218e38a78862a5a (patch) | |
| tree | aa89edacaecd535f8b3d7cf34ba6abe9f5ea6a3f | |
| parent | a692ff93ef5ba90e07c3fdecf05359bdca9b9066 (diff) | |
| parent | ad8f736b7404503d8f5164f4879175a2258dd64b (diff) | |
| download | ffmpeg-069e462bebdea61d57e73099e218e38a78862a5a.tar.gz | |
Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b'
* commit 'ad8f736b7404503d8f5164f4879175a2258dd64b':
mxf: Remove typo
also See: [FFmpeg-devel] [PATCH 3/3] lavf/mxfdec: delete trailing semi-colon
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mxfdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 2abd34d604..0d17a02964 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -508,7 +508,7 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size } /* if no previous body partition are found point to the header * partition */ - if (partition->previous_partition == partition->this_partition); + if (partition->previous_partition == partition->this_partition) partition->previous_partition = 0; av_log(mxf->fc, AV_LOG_ERROR, "Overriding PreviousPartition with %"PRIx64"\n", |