Merge commit 'ef1b23ad'
* commit 'ef1b23ad': (21 commits) jvdec: set channel layout iss: set channel layout ipmovie: set channel layout iff: set channel layout idroqdec: set channel layout gxfdec: set channel layout when applicable gsmdec: set channel layout flvdec: set channel layout dv: set channel layout dsicin: set channel layout daud: set channel layout cdxl: set channel layout bmv: set channel layout bink: set channel layout bfi: set channel layout bethsoftvid: set channel layout apc: set channel layout amr: set channel_layout ppc: replace pointer casting with AV_COPY32 ppc: fix some unused variable warnings ... Conflicts: libavformat/amr.c libavformat/iff.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- configure 1 addition, 2 deletionsconfigure
- libavcodec/ppc/h264_altivec.c 2 additions, 1 deletionlibavcodec/ppc/h264_altivec.c
- libavcodec/ppc/h264_altivec_template.c 6 additions, 9 deletionslibavcodec/ppc/h264_altivec_template.c
- libavformat/amr.c 3 additions, 0 deletionslibavformat/amr.c
- libavformat/apc.c 9 additions, 3 deletionslibavformat/apc.c
- libavformat/bethsoftvid.c 2 additions, 0 deletionslibavformat/bethsoftvid.c
- libavformat/bfi.c 2 additions, 0 deletionslibavformat/bfi.c
- libavformat/bink.c 8 additions, 1 deletionlibavformat/bink.c
- libavformat/bmv.c 2 additions, 0 deletionslibavformat/bmv.c
- libavformat/cdxl.c 8 additions, 1 deletionlibavformat/cdxl.c
- libavformat/daud.c 3 additions, 0 deletionslibavformat/daud.c
- libavformat/dsicin.c 2 additions, 0 deletionslibavformat/dsicin.c
- libavformat/dv.c 2 additions, 0 deletionslibavformat/dv.c
- libavformat/flvdec.c 4 additions, 0 deletionslibavformat/flvdec.c
- libavformat/gsmdec.c 2 additions, 0 deletionslibavformat/gsmdec.c
- libavformat/gxf.c 4 additions, 0 deletionslibavformat/gxf.c
- libavformat/idroqdec.c 9 additions, 1 deletionlibavformat/idroqdec.c
- libavformat/iff.c 10 additions, 2 deletionslibavformat/iff.c
- libavformat/ipmovie.c 3 additions, 0 deletionslibavformat/ipmovie.c
- libavformat/iss.c 8 additions, 1 deletionlibavformat/iss.c
Loading
Please register or sign in to comment