diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 18:53:56 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 18:54:18 +0400 |
| commit | 3a7ef8dc44abe3b8f58cbf69acfd361287c12f2b (patch) | |
| tree | 039f7c840093da78f566977fd6def1139ddb5839 /libavcodec/tak.c | |
| parent | 64e174e8b8975e36827a84c6d9adb6f161bc734f (diff) | |
| parent | 57231e4d5b467833fb289439cd35a92513bb55c1 (diff) | |
Merge commit '57231e4d5b467833fb289439cd35a92513bb55c1'
* commit '57231e4d5b467833fb289439cd35a92513bb55c1':
tak: demuxer, parser, and decoder
Not merged as requested by Author and Maintainer of tak in FFmpeg.
I just merged a few typo fixes and minor cosmetic improvments.
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/tak.c
libavcodec/tak.h
libavcodec/tak_parser.c
libavcodec/takdec.c
libavcodec/version.h
libavformat/takdec.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tak.c')
| -rw-r--r-- | libavcodec/tak.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/tak.c b/libavcodec/tak.c index e7fbf6bc54..616cbc80da 100644 --- a/libavcodec/tak.c +++ b/libavcodec/tak.c @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "tak.h" +#include "libavutil/bswap.h" #include "libavutil/crc.h" #include "libavutil/intreadwrite.h" -#include "libavutil/bswap.h" +#include "tak.h" static const int64_t tak_channel_layouts[] = { 0, |