diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:25:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:27:29 +0100 |
| commit | 35a788d953838c1b7f34038ef54fddc3d11994fe (patch) | |
| tree | cf8179e051dbf1881f591317f4146a2edbd738dc /libavcodec/libmp3lame.c | |
| parent | cc2cfdc49786a8268d1514661c17ea96035d6f1d (diff) | |
| parent | b063582e0c4f775a8ba377488bd085595e0e7fae (diff) | |
| download | ffmpeg-35a788d953838c1b7f34038ef54fddc3d11994fe.tar.gz | |
Merge commit 'b063582e0c4f775a8ba377488bd085595e0e7fae'
* commit 'b063582e0c4f775a8ba377488bd085595e0e7fae':
h264: move intra_pcm_ptr into the per-slice context
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libmp3lame.c')
0 files changed, 0 insertions, 0 deletions