diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-19 15:30:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-19 15:30:34 +0200 |
| commit | 8846115b1a5c29892fdf2c74747f71d37e16e864 (patch) | |
| tree | 4ab64b8114601175846df80eedfa3ea7d49df657 /libavcodec/wmavoice.c | |
| parent | 67d501b4f1758ba0783b14da4a6b3abd506792fa (diff) | |
| parent | b16d001b628237c93529c2be169ea5af1be7c9d7 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rv34: use ff_MPV_common_frame_size_change()
mpegvideo: add reinit function for frame parameter changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmavoice.c')
0 files changed, 0 insertions, 0 deletions