diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-27 09:43:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-27 09:43:29 +0200 |
| commit | e8023dbaf0db494f9676a251cb05792dbf3758be (patch) | |
| tree | 2b53d4e4e3cc0118935c2d67a892fe41ab9a616b /libavcodec/msgsmdec.c | |
| parent | 90279285227914dabf2cd011b186d2182291363a (diff) | |
| parent | 979e9e8f3671d49463fd309dcd3d9c445a4c63de (diff) | |
| download | ffmpeg-e8023dbaf0db494f9676a251cb05792dbf3758be.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wtv: Drop some casts that now are unnecessary
Conflicts:
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msgsmdec.c')
0 files changed, 0 insertions, 0 deletions